diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.cdl b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.cdl
index 38f1ac5..cf5ad07 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.cdl
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a2111o_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 pndC C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPD0 y D1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 y D1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__a2111o_1
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.netlist.tsv b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.netlist.tsv
index 2c292fe..e600911 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a2111o_1	A1:I A2:I B1:I C1:I D1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a2111o/sky130_fd_sc_ls__a2111o_1.spice b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.spice
index ad274f5..ec989a1 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.spice
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a2111o_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_85_136# D1 a_431_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=2.4e+11p ps=2.48e+06u
-M1001 a_168_136# A1 a_85_136# VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=5.184e+11p ps=5.46e+06u
-M1002 a_85_136# D1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=7.465e+11p ps=6.29e+06u
-M1003 VGND A2 a_168_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_85_136# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND C1 a_85_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.75e+11p pd=5.15e+06u as=6.48e+11p ps=5.47e+06u
-M1007 X a_85_136# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1008 a_353_392# B1 a_80_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1009 VPWR A1 a_80_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_431_392# C1 a_353_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_85_136# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
+X0 a_353_392# C1 a_431_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND a_85_136# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_80_392# B1 a_353_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_85_136# A1 a_168_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VGND B1 a_85_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VGND D1 a_85_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_431_392# D1 a_85_136# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_80_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VPWR a_85_136# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_168_136# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_85_136# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR A2 a_80_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.cdl b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.cdl
index 2f159ca..9dacec9 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.cdl
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a2111o_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 pndC C1 VPB 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
+MMPD0 y D1 VPB 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
+MMIPX X y VPB 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 y B1 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
-MMPC0 pndC C1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 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
-MMPD0 y D1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 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
-MMIPX X y VPB 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 y B1 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
-MMNC0 y C1 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
-MMND0 y D1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a2111o_2
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.netlist.tsv b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.netlist.tsv
index f677d4f..354d4d1 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a2111o_2	A1:I A2:I B1:I C1:I D1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.spice b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.spice
index fb96d18..b2a2d36 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.spice
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a2111o_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_630_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.448e+11p pd=5.81e+06u as=1.0528e+12p ps=8.6e+06u
-M1001 a_630_368# B1 a_522_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.368e+11p ps=3.02e+06u
-M1002 a_444_368# D1 a_91_244# VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.688e+11p pd=2.72e+06u as=3.08e+11p ps=2.79e+06u
-M1003 a_522_368# C1 a_444_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_91_244# C1 VGND VNB nshort w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=1.0508e+12p ps=8.76e+06u
-M1005 VGND a_91_244# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1006 X a_91_244# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_771_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=0p ps=0u
-M1008 a_91_244# A1 a_771_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_91_244# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1010 VPWR a_91_244# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_630_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B1 a_91_244# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D1 a_91_244# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_91_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_771_74# A1 a_91_244# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_91_244# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_522_368# B1 a_630_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_91_244# D1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_91_244# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_91_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND A2 a_771_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND C1 a_91_244# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_91_244# D1 a_444_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VPWR A1 a_630_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND a_91_244# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_444_368# C1 a_522_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_630_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.cdl b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.cdl
index 64c09a0..f735635 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.cdl
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a2111o_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 pndC C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPD0 y D1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 y D1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a2111o_4
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.netlist.tsv b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.netlist.tsv
index 44ed4a6..1662e94 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a2111o_4	A1:I A2:I B1:I C1:I D1: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.spice b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.spice
index d0c40df..41f6b65 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.spice
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__a2111o_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_137_260# D1 a_549_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=8.5e+11p ps=7.7e+06u
-M1001 VGND a_137_260# X VNB nshort w=740000u l=150000u
-+  ad=1.3711e+12p pd=1.359e+07u as=4.144e+11p ps=4.08e+06u
-M1002 a_814_392# C1 a_549_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1003 VGND C1 a_137_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=7.168e+11p ps=7.36e+06u
-M1004 VPWR A2 a_1013_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.552e+12p pd=1.362e+07u as=1.15e+12p ps=1.03e+07u
-M1005 X a_137_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1006 a_1210_74# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=5.184e+11p pd=5.46e+06u as=0p ps=0u
-M1007 a_814_392# B1 a_1013_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B1 a_137_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_549_392# C1 a_814_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1013_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_137_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_137_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_137_260# D1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1013_392# B1 a_814_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1210_74# A1 a_137_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_137_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_1013_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_137_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND D1 a_137_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_137_260# C1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_137_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_137_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_549_392# D1 a_137_260# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_137_260# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2 a_1210_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1013_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_137_260# A1 a_1210_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_549_392# C1 a_814_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_1013_392# B1 a_814_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND D1 a_137_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_137_260# D1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR a_137_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 X a_137_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_137_260# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VGND a_137_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_137_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 X a_137_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND B1 a_137_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR A2 a_1013_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VPWR A1 a_1013_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_814_392# C1 a_549_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_814_392# B1 a_1013_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_1210_74# A1 a_137_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_137_260# D1 a_549_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 X a_137_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_549_392# D1 a_137_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 X a_137_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND C1 a_137_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_137_260# A1 a_1210_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_137_260# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_1210_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 VGND a_137_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VGND A2 a_1210_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 a_1013_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 a_1013_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.cdl b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.cdl
index d0fce1b..4d4e48c 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.cdl
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a2111oi_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 pndC C1 VPB 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
+MMPD0 Y D1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
-MMPC0 pndC C1 VPB 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
-MMPD0 Y D1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNC0 Y C1 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
-MMND0 Y D1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 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_ls__a2111oi_1
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.netlist.tsv b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.netlist.tsv
index fb68da6..0ec121b 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a2111oi_1	A1:I A2:I B1:I C1:I D1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	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/a2111oi/sky130_fd_sc_ls__a2111oi_1.spice b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.spice
index 8f90caa..150b2bf 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.spice
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a2111oi_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_234_368# C1 a_156_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.368e+11p pd=3.02e+06u as=2.688e+11p ps=2.72e+06u
-M1001 VGND A2 a_461_74# VNB nshort w=740000u l=150000u
-+  ad=7.77e+11p pd=6.54e+06u as=2.368e+11p ps=2.12e+06u
-M1002 a_461_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1003 Y D1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_342_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.448e+11p pd=5.81e+06u as=4.368e+11p ps=3.02e+06u
-M1005 a_342_368# B1 a_234_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_156_368# D1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1008 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_342_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_342_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_461_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_234_368# B1 a_342_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_156_368# C1 a_234_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y A1 a_461_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y D1 a_156_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A2 a_342_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.cdl b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.cdl
index 5de4ca6..dec5576 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.cdl
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a2111oi_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 pndC C1 VPB 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
+MMPD0 Y D1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
-MMPC0 pndC C1 VPB 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
-MMPD0 Y D1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNC0 Y C1 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
-MMND0 Y D1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 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_ls__a2111oi_2
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.netlist.tsv b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.netlist.tsv
index 8d9b513..a2b8f64 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a2111oi_2	A1:I A2:I B1:I C1:I D1: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	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/a2111oi/sky130_fd_sc_ls__a2111oi_2.spice b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.spice
index b5f4869..1886b26 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.spice
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.spice
@@ -16,38 +16,21 @@
 
 
 .subckt sky130_fd_sc_ls__a2111oi_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=7.141e+11p pd=6.37e+06u as=6.919e+11p ps=6.31e+06u
-M1001 a_722_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=0p ps=0u
-M1002 a_69_368# D1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.52e+11p pd=8.42e+06u as=3.36e+11p ps=2.84e+06u
-M1003 VPWR A2 a_533_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.288e+12p ps=1.126e+07u
-M1004 a_69_368# C1 a_334_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1005 a_533_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_334_368# B1 a_533_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_722_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_334_368# C1 a_69_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_533_368# B1 a_334_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_533_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_722_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A1 a_722_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_533_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y D1 a_69_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_334_368# B1 a_533_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_722_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND A2 a_722_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y D1 a_69_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_533_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_533_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR A2 a_533_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_533_368# B1 a_334_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_334_368# C1 a_69_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_69_368# C1 a_334_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_722_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y A1 a_722_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_69_368# D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR A1 a_533_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.cdl b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.cdl
index 85efe78..807def0 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.cdl
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a2111oi_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 pndC C1 VPB 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
+MMPD0 Y D1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
-MMPC0 pndC C1 VPB phighvt 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
-MMPD0 Y D1 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNC0 Y C1 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
-MMND0 Y D1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 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
 .ENDS sky130_fd_sc_ls__a2111oi_4
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.netlist.tsv b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.netlist.tsv
index 88c3be0..d41357b 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a2111oi_4	A1:I A2:I B1:I C1:I D1: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.spice b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.spice
index 677dac5..41017d8 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.spice
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__a2111oi_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 Y D1 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.624e+12p ps=1.41e+07u
-M1001 VPWR A1 a_853_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.344e+12p pd=1.136e+07u as=2.3184e+12p ps=1.982e+07u
-M1002 a_29_368# C1 a_474_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.344e+12p ps=1.136e+07u
-M1003 a_1228_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.0434e+12p pd=1.022e+07u as=1.887e+12p ps=1.398e+07u
-M1004 a_1228_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.036e+12p ps=1.02e+07u
-M1005 a_853_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_29_368# D1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1228_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_853_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A2 a_853_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_474_368# C1 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y D1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_1228_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_853_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_474_368# B1 a_853_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_853_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_29_368# C1 a_474_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_474_368# B1 a_853_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1228_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_853_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y D1 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_29_368# D1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A2 a_1228_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_853_368# B1 a_474_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND D1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A1 a_1228_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_853_368# B1 a_474_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A1 a_1228_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_474_368# C1 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR A2 a_853_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_853_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_29_368# C1 a_474_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR A2 a_853_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_1228_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_29_368# D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A1 a_853_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A2 a_1228_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_1228_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR A1 a_853_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_474_368# B1 a_853_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_29_368# D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_474_368# C1 a_29_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_1228_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_474_368# C1 a_29_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_853_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 Y A1 a_1228_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 Y D1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 Y D1 a_29_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_853_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 Y D1 a_29_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_853_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_853_368# B1 a_474_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_853_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_1228_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 Y A1 a_1228_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 a_853_368# B1 a_474_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 VGND A2 a_1228_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_29_368# C1 a_474_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 a_474_368# B1 a_853_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_1.cdl b/cells/a211o/sky130_fd_sc_ls__a211o_1.cdl
index ec87662..ba04ecc 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_1.cdl
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a211o_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__a211o_1
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_1.netlist.tsv b/cells/a211o/sky130_fd_sc_ls__a211o_1.netlist.tsv
index d64dea8..b969566 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_1.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a211o_1	A1:I A2:I B1:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a211o/sky130_fd_sc_ls__a211o_1.spice b/cells/a211o/sky130_fd_sc_ls__a211o_1.spice
index 6b3cb62..eb054bb 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_1.spice
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a211o_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_279_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.75e+11p pd=5.15e+06u as=6.38e+11p ps=5.45e+06u
-M1001 VGND a_81_264# X VNB nshort w=740000u l=150000u
-+  ad=5.3685e+11p pd=4.68e+06u as=1.961e+11p ps=2.01e+06u
-M1002 a_550_392# B1 a_279_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1003 a_81_264# C1 a_550_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1004 VPWR A2 a_279_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B1 a_81_264# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.488e+11p ps=3.65e+06u
-M1006 a_81_264# C1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_366_136# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=2.08e+11p pd=1.93e+06u as=0p ps=0u
-M1008 a_81_264# A1 a_366_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_81_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
+X0 X a_81_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_81_264# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_279_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VPWR A1 a_279_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND A2 a_366_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 X a_81_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND C1 a_81_264# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_366_136# A1 a_81_264# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_550_392# C1 a_81_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_279_392# B1 a_550_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_2.cdl b/cells/a211o/sky130_fd_sc_ls__a211o_2.cdl
index 4f709e7..ce5004f 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_2.cdl
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a211o_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 y B1 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 y B1 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
-MMNC0 y C1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a211o_2
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_2.netlist.tsv b/cells/a211o/sky130_fd_sc_ls__a211o_2.netlist.tsv
index 8bef6e0..ef8d617 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_2.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a211o_2	A1:I A2:I B1:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_2.spice b/cells/a211o/sky130_fd_sc_ls__a211o_2.spice
index 7855a54..25b9daa 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_2.spice
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a211o_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_85_270# C1 a_600_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=2.7e+11p ps=2.54e+06u
-M1001 a_600_392# B1 a_317_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.75e+11p ps=5.15e+06u
-M1002 a_399_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=9.731e+11p ps=7.07e+06u
-M1003 VGND a_85_270# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 VPWR a_85_270# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.006e+12p pd=8.36e+06u as=3.36e+11p ps=2.84e+06u
-M1005 X a_85_270# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B1 a_85_270# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.847e+11p ps=4.27e+06u
-M1007 VPWR A2 a_317_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_85_270# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_85_270# C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_317_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_85_270# A1 a_399_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_399_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_85_270# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR A1 a_317_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_317_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_600_392# C1 a_85_270# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_399_74# A1 a_85_270# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR a_85_270# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_317_392# B1 a_600_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_85_270# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_85_270# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND C1 a_85_270# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 X a_85_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_4.cdl b/cells/a211o/sky130_fd_sc_ls__a211o_4.cdl
index f45b1e4..cb63201 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_4.cdl
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a211o_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a211o_4
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_4.netlist.tsv b/cells/a211o/sky130_fd_sc_ls__a211o_4.netlist.tsv
index 73dbdcb..1716f30 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_4.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a211o_4	A1:I A2:I B1:I C1: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_4.spice b/cells/a211o/sky130_fd_sc_ls__a211o_4.spice
index 27ab174..cc314ff 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_4.spice
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__a211o_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_1064_123# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=1.50765e+12p ps=1.284e+07u
-M1001 X a_105_280# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1002 a_105_280# A1 a_1064_123# VNB nshort w=640000u l=150000u
-+  ad=5.79525e+11p pd=5.76e+06u as=0p ps=0u
-M1003 a_517_392# B1 a_602_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.155e+12p pd=1.031e+07u as=6.75e+11p ps=5.35e+06u
-M1004 a_105_280# C1 a_602_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1005 a_105_280# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A2 a_517_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.907e+12p pd=1.433e+07u as=0p ps=0u
-M1007 VPWR A1 a_517_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_105_280# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1009 a_602_392# C1 a_105_280# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_105_280# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_105_280# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_517_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_105_280# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_517_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B1 a_105_280# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_105_280# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1064_123# A1 a_105_280# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_105_280# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_105_280# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND C1 a_105_280# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_105_280# C1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A2 a_1064_123# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_602_392# B1 a_517_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_602_392# B1 a_517_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR A2 a_517_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND C1 a_105_280# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VGND a_105_280# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 X a_105_280# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_105_280# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_105_280# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VGND a_105_280# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 X a_105_280# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_105_280# C1 a_602_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 X a_105_280# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_1064_123# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 X a_105_280# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR a_105_280# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND A2 a_1064_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_105_280# A1 a_1064_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_517_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_517_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_517_392# B1 a_602_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VPWR A1 a_517_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 a_1064_123# A1 a_105_280# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VGND B1 a_105_280# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 VPWR a_105_280# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_602_392# C1 a_105_280# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.cdl b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.cdl
index f879592..80481da 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.cdl
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a211oi_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB 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
-MMPC0 Y C1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNC0 Y C1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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_ls__a211oi_1
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.netlist.tsv b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.netlist.tsv
index 0754eb5..d7dca2a 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a211oi_1	A1:I A2:I B1:I C1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a211oi/sky130_fd_sc_ls__a211oi_1.spice b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.spice
index 7ec2f24..bf6ae7f 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.spice
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__a211oi_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_71_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.44e+11p pd=5.63e+06u as=4.368e+11p ps=3.02e+06u
-M1001 Y A1 a_159_74# VNB nshort w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=1.554e+11p ps=1.9e+06u
-M1002 a_354_368# B1 a_71_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.696e+11p pd=2.9e+06u as=0p ps=0u
-M1003 a_159_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.847e+11p ps=4.27e+06u
-M1004 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_71_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 a_354_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1007 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_71_368# B1 a_354_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_354_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A2 a_159_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR A1 a_71_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_159_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_71_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.cdl b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.cdl
index 554f61d..bb5ee11 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.cdl
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a211oi_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB 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
-MMPC0 Y C1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNC0 Y C1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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_ls__a211oi_2
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.netlist.tsv b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.netlist.tsv
index f4b292f..deceb96 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a211oi_2	A1:I A2:I B1:I C1: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a211oi/sky130_fd_sc_ls__a211oi_2.spice b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.spice
index dd224a2..e4631e3 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.spice
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a211oi_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_114_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.008e+12p pd=8.52e+06u as=9.744e+11p ps=8.46e+06u
-M1001 a_38_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=6.438e+11p ps=6.18e+06u
-M1002 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=7.4e+11p pd=4.96e+06u as=0p ps=0u
-M1003 VGND A2 a_38_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_497_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.744e+11p pd=8.46e+06u as=3.36e+11p ps=2.84e+06u
-M1005 VPWR A2 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_114_368# B1 a_497_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A1 a_38_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_497_368# B1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_38_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_114_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 a_497_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_497_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 Y A1 a_38_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR A2 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_497_368# B1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_38_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y C1 a_497_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_38_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_114_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_114_368# B1 a_497_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_114_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND A2 a_38_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.cdl b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.cdl
index 381f26b..707a867 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.cdl
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a211oi_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB phighvt 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
-MMPC0 Y C1 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNC0 Y C1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__a211oi_4
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.netlist.tsv b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.netlist.tsv
index 0be306b..9b9bbfc 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a211oi_4	A1:I A2:I B1:I C1: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.spice b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.spice
index f001029..adc965f 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.spice
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__a211oi_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 a_901_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.624e+12p ps=1.41e+07u
-M1001 VGND A2 a_92_74# VNB nshort w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=1.0286e+12p ps=1.018e+07u
-M1002 VPWR A2 a_77_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.344e+12p pd=1.136e+07u as=2.296e+12p ps=1.978e+07u
-M1003 Y C1 a_901_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_77_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_901_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_77_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_77_368# B1 a_901_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_901_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A1 a_92_74# VNB nshort w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=0p ps=0u
-M1010 a_901_368# B1 a_77_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_92_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_92_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A2 a_77_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A1 a_77_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_77_368# B1 a_901_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A1 a_92_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_77_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_77_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_901_368# B1 a_77_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_92_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_92_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_77_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A2 a_92_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_901_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_901_368# B1 a_77_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y C1 a_901_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_77_368# B1 a_901_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR A1 a_77_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_77_368# B1 a_901_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR A1 a_77_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_92_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND A2 a_92_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_92_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y A1 a_92_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_77_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_92_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y C1 a_901_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_77_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_901_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_92_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND A2 a_92_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_901_368# B1 a_77_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 Y A1 a_92_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_77_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_77_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VPWR A2 a_77_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VPWR A2 a_77_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.cdl b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.cdl
index 27285ab..5fb7688 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.cdl
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a21bo_1 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB 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
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB 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
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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_ls__a21bo_1
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.netlist.tsv b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.netlist.tsv
index 097e940..283ea0e 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a21bo_1	A1:I A2:I B1_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a21bo/sky130_fd_sc_ls__a21bo_1.spice b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.spice
index 08804aa..f2c2b8d 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.spice
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a21bo_1 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_194_136# a_272_110# a_34_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=5.75e+11p ps=5.15e+06u
-M1001 a_122_136# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=5.6545e+11p ps=5.75e+06u
-M1002 X a_194_136# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1003 VGND a_272_110# a_194_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.496e+11p ps=2.06e+06u
-M1004 VPWR A2 a_34_392# VPB phighvt w=1e+06u l=150000u
-+  ad=7.36e+11p pd=5.67e+06u as=0p ps=0u
-M1005 VPWR B1_N a_272_110# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1006 VGND B1_N a_272_110# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1007 a_194_136# A1 a_122_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_34_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_194_136# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
+X0 a_34_392# a_272_110# a_194_136# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND a_194_136# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_122_136# A1 a_194_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VGND A2 a_122_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR a_194_136# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_194_136# a_272_110# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_272_110# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 VPWR A1 a_34_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_34_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_272_110# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.cdl b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.cdl
index 7dc418f..6930e7b 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.cdl
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a21bo_2 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB 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
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 y B1 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
-MMIPX X y VPB 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 y B1 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
-MMINB1N B1 B1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a21bo_2
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.netlist.tsv b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.netlist.tsv
index ee218be..8ac7df5 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a21bo_2	A1:I A2:I B1_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.spice b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.spice
index 201b1a5..e2d4da9 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.spice
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a21bo_2 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_504_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.75e+11p pd=5.15e+06u as=9.916e+11p ps=8.36e+06u
-M1001 X a_187_244# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1002 a_187_244# a_32_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=9.689e+11p ps=7.11e+06u
-M1003 VPWR a_187_244# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_187_244# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 VPWR B1_N a_32_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1006 VGND A2 a_587_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1007 a_504_392# a_32_368# a_187_244# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1008 VPWR A1 a_504_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1_N a_32_368# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.4575e+11p ps=1.63e+06u
-M1010 a_587_74# A1 a_187_244# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_187_244# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_504_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR a_187_244# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND a_187_244# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_187_244# A1 a_587_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_32_368# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 VPWR A2 a_504_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 X a_187_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 X a_187_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_32_368# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_187_244# a_32_368# a_504_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_587_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND a_32_368# a_187_244# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.cdl b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.cdl
index 6239538..aa47343 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.cdl
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a21bo_4 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt 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
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a21bo_4
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.netlist.tsv b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.netlist.tsv
index 82e19a8..9993490 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a21bo_4	A1:I A2:I B1_N: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.spice b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.spice
index d03f3ea..d834e1f 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.spice
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__a21bo_4 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 X a_187_338# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.34918e+12p ps=1.097e+07u
-M1001 VPWR A1 a_596_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.642e+12p pd=1.38e+07u as=1.15e+12p ps=1.03e+07u
-M1002 VPWR a_187_338# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1003 VGND a_187_338# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B1_N a_29_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1005 a_864_123# A1 a_187_338# VNB nshort w=640000u l=150000u
-+  ad=3.968e+11p pd=3.8e+06u as=3.584e+11p ps=3.68e+06u
-M1006 X a_187_338# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_864_123# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_187_338# a_29_392# a_596_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1009 a_596_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_187_338# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_187_338# A1 a_864_123# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_187_338# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_596_392# a_29_392# a_187_338# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_29_392# a_187_338# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_187_338# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A2 a_596_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_864_123# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_187_338# a_29_392# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B1_N a_29_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1020 X a_187_338# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_596_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_187_338# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_187_338# a_29_392# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 X a_187_338# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_864_123# A1 a_187_338# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_596_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 X a_187_338# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A2 a_596_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_596_392# a_29_392# a_187_338# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND a_29_392# a_187_338# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_187_338# A1 a_864_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_29_392# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VPWR a_187_338# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND A2 a_864_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_187_338# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A1 a_596_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_864_123# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_187_338# a_29_392# a_596_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 X a_187_338# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_596_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_29_392# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 VGND a_187_338# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VGND a_187_338# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.cdl b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.cdl
index 4422bd6..bd28c90 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.cdl
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a21boi_1 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 net40 A1 VPB 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
+MMPA1 net40 A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMIPB1N B1 B1_N VPB 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
+MMNA0 Y A1 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
-MMPA1 net40 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 Y B1 VPB 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
-MMIPB1N B1 B1_N VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMINB1N B1 B1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a21boi_1
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.netlist.tsv b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.netlist.tsv
index 0f4ec66..89b6f82 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a21boi_1	A1:I A2:I B1_N: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	net40	A1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net40	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net40	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net40	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net40	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net40	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.spice b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.spice
index 4c8b592..3e56941 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.spice
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__a21boi_1 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_437_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=2.368e+11p pd=2.12e+06u as=2.072e+11p ps=2.04e+06u
-M1001 VPWR A1 a_348_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.006e+11p pd=5.13e+06u as=6.44e+11p ps=5.63e+06u
-M1002 VGND B1_N a_29_424# VNB nshort w=550000u l=150000u
-+  ad=5.5275e+11p pd=4.59e+06u as=1.4575e+11p ps=1.63e+06u
-M1003 Y a_29_424# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_348_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B1_N a_29_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1006 VGND A2 a_437_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_348_368# a_29_424# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
+X0 a_29_424# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 VGND a_29_424# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_348_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR A2 a_348_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y A1 a_437_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_29_424# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 Y a_29_424# a_348_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_437_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.cdl b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.cdl
index ec4a115..14fa8ef 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.cdl
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a21boi_2 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 net40 A1 VPB 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
+MMPA1 net40 A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 Y A1 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
-MMPA1 net40 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 Y B1 VPB 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
-MMIPB1N B1 B1_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMINB1N B1 B1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a21boi_2
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.netlist.tsv b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.netlist.tsv
index e120bf3..f047019 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a21boi_2	A1:I A2:I B1_N: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	net40	A1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net40	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net40	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net40	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net40	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net40	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.spice b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.spice
index 499dda2..9867cbd 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.spice
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a21boi_2 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VGND B1_N a_62_94# VNB nshort w=640000u l=150000u
-+  ad=6.474e+11p pd=6.21e+06u as=1.696e+11p ps=1.81e+06u
-M1001 VPWR A1 a_241_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.694e+11p pd=8.27e+06u as=1.288e+12p ps=1.126e+07u
-M1002 a_62_94# B1_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1003 Y a_62_94# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1004 VGND A2 a_436_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=5.994e+11p ps=6.06e+06u
-M1005 a_241_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_241_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_62_94# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A1 a_436_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_241_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_62_94# a_241_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1011 a_436_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_436_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_241_368# a_62_94# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_62_94# a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND a_62_94# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_62_94# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR B1_N a_62_94# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR A2 a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_436_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_241_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A1 a_436_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_436_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_241_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_241_368# a_62_94# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND A2 a_436_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y a_62_94# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR A1 a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.cdl b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.cdl
index 49ff26f..6791d31 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.cdl
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a21boi_4 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 net40 A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 net40 A1 VPB 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
+MMPA1 net40 A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=2 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
+MMNA0 Y A1 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
-MMPA1 net40 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 Y B1 VPB phighvt 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
-MMIPB1N B1 B1_N VPB phighvt m=2 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMINB1N B1 B1_N 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
+MMINB1N B1 B1_N 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_ls__a21boi_4
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.netlist.tsv b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.netlist.tsv
index 39456a4..671ca6b 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a21boi_4	A1:I A2:I B1_N: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	net40	A1	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net40	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net40	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net40	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net40	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net40	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	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/a21boi/sky130_fd_sc_ls__a21boi_4.spice b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.spice
index e0f6ec6..9ee1f52 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.spice
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_ls__a21boi_4 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_46_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=8.288e+11p ps=8.16e+06u
-M1001 a_803_323# B1_N VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=1.0249e+12p ps=1.017e+07u
-M1002 a_31_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.296e+12p pd=1.978e+07u as=1.806e+12p ps=1.582e+07u
-M1003 Y A1 a_46_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_46_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_803_323# a_31_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1006 Y a_803_323# a_31_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_803_323# B1_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1008 VPWR A2 a_31_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_31_368# a_803_323# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_46_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_46_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_803_323# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A1 a_46_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1_N a_803_323# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_31_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_31_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_31_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_803_323# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_46_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_803_323# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A2 a_31_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A1 a_31_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_803_323# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_31_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_31_368# a_803_323# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_46_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_31_368# a_803_323# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR B1_N a_803_323# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_31_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_31_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_46_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A2 a_46_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_46_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_31_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A2 a_46_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_803_323# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_31_368# a_803_323# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y a_803_323# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_803_323# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 VGND a_803_323# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND B1_N a_803_323# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_31_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y A1 a_46_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Y a_803_323# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR A2 a_31_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 Y a_803_323# a_31_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_46_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR A2 a_31_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VPWR A1 a_31_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 VPWR A1 a_31_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 Y A1 a_46_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_46_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 Y a_803_323# a_31_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_1.cdl b/cells/a21o/sky130_fd_sc_ls__a21o_1.cdl
index b037a0c..a2f4b4e 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_1.cdl
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_1.netlist.tsv b/cells/a21o/sky130_fd_sc_ls__a21o_1.netlist.tsv
index dd188ed..4c22a6d 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_1.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a21o/sky130_fd_sc_ls__a21o_1.spice b/cells/a21o/sky130_fd_sc_ls__a21o_1.spice
index cb8c200..b10951b 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_1.spice
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__a21o_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_364_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.75e+11p pd=5.15e+06u as=6.38e+11p ps=5.45e+06u
-M1001 VGND a_81_264# X VNB nshort w=740000u l=150000u
-+  ad=4.541e+11p pd=4.09e+06u as=1.961e+11p ps=2.01e+06u
-M1002 a_364_392# B1 a_81_264# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1003 VGND A2 a_452_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.93e+06u
-M1004 a_81_264# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1005 a_452_136# A1 a_81_264# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_364_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_81_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
+X0 a_452_136# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_81_264# B1 a_364_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND B1 a_81_264# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 X a_81_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_81_264# A1 a_452_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_364_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 VPWR A2 a_364_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 X a_81_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_2.cdl b/cells/a21o/sky130_fd_sc_ls__a21o_2.cdl
index d3a5c74..a7dbcca 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_2.cdl
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a21o_2 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 y B1 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 y B1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a21o_2
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_2.netlist.tsv b/cells/a21o/sky130_fd_sc_ls__a21o_2.netlist.tsv
index 8e7983c..ec27696 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_2.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a21o_2	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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_2.spice b/cells/a21o/sky130_fd_sc_ls__a21o_2.spice
index 253eb91..be2fea0 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_2.spice
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a21o_2 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 X a_84_244# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.954e+11p ps=6.86e+06u
-M1001 a_401_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.75e+11p pd=5.15e+06u as=9.16e+11p ps=8.18e+06u
-M1002 a_84_244# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 X a_84_244# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1004 VPWR a_84_244# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_401_392# B1 a_84_244# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1006 VGND a_84_244# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_484_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1008 a_484_74# A1 a_84_244# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_401_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_401_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_484_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND a_84_244# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_84_244# B1 a_401_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND B1 a_84_244# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 X a_84_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_84_244# A1 a_484_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_84_244# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_401_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 X a_84_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_4.cdl b/cells/a21o/sky130_fd_sc_ls__a21o_4.cdl
index 6b8a608..1b68b72 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_4.cdl
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a21o_4 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a21o_4
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_4.netlist.tsv b/cells/a21o/sky130_fd_sc_ls__a21o_4.netlist.tsv
index 9a88d86..c6749db 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_4.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a21o_4	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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_4.spice b/cells/a21o/sky130_fd_sc_ls__a21o_4.spice
index 2d84097..697e92b 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_4.spice
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__a21o_4 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 X a_91_48# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.011e+12p ps=9.9e+06u
-M1001 a_503_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=1.15e+12p pd=1.03e+07u as=1.552e+12p ps=1.362e+07u
-M1002 VPWR a_91_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1003 VPWR A2 a_503_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_91_48# B1 a_503_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1005 a_503_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_700_74# A1 a_91_48# VNB nshort w=640000u l=150000u
-+  ad=5.184e+11p pd=5.46e+06u as=3.584e+11p ps=3.68e+06u
-M1007 X a_91_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_91_48# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_503_392# B1 a_91_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_91_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_91_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_91_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_91_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_700_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_91_48# A1 a_700_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_503_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B1 a_91_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_700_74# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_91_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_91_48# A1 a_700_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_700_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 X a_91_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_91_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_91_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND B1 a_91_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_503_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_91_48# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_503_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 X a_91_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_503_392# B1 a_91_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VPWR A2 a_503_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 X a_91_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 X a_91_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND a_91_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND A2 a_700_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_700_74# A1 a_91_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VPWR A1 a_503_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_91_48# B1 a_503_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VPWR a_91_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.cdl b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.cdl
index 40d204f..09f27cd 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.cdl
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB 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
-MMPB0 Y B1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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_ls__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.netlist.tsv b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.netlist.tsv
index 39c4f25..2320b9c 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a21oi/sky130_fd_sc_ls__a21oi_1.spice b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.spice
index ca281df..1d5d446 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.spice
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__a21oi_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_29_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.44e+11p pd=5.63e+06u as=3.696e+11p ps=2.9e+06u
-M1001 Y B1 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1002 Y A1 a_117_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1003 VPWR A2 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=4.07e+11p pd=4.06e+06u as=0p ps=0u
-M1005 a_117_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_29_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_29_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_29_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_117_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND A2 a_117_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.cdl b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.cdl
index 20423cc..1f6ecc8 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.cdl
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__a21oi_2 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB 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
-MMPB0 Y B1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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_ls__a21oi_2
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.netlist.tsv b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.netlist.tsv
index 5bb122a..bb14bd0 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__a21oi_2	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a21oi/sky130_fd_sc_ls__a21oi_2.spice b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.spice
index 82b193d..4854d31 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.spice
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_ls__a21oi_2 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_131_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.392e+11p pd=5.8e+06u as=1.288e+12p ps=1.126e+07u
-M1001 a_280_107# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=6.5505e+11p pd=6.27e+06u as=5.83425e+11p ps=4.82e+06u
-M1002 a_131_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_280_107# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_131_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A1 a_280_107# VNB nshort w=740000u l=150000u
-+  ad=4.033e+11p pd=4.05e+06u as=0p ps=0u
-M1006 a_131_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_131_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1008 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_131_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_280_107# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_131_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A1 a_280_107# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_131_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_280_107# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_131_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_131_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A1 a_131_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND A2 a_280_107# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_280_107# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR A2 a_131_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.cdl b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.cdl
index 49ca70f..92dc4d4 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.cdl
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__a21oi_4 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt 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
-MMPB0 Y B1 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__a21oi_4
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.netlist.tsv b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.netlist.tsv
index 9e0e7b1..68e6a95 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__a21oi_4	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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.spice b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.spice
index 23ddfa3..87b0e2b 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.spice
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__a21oi_4 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_69_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.296e+12p pd=1.978e+07u as=1.344e+12p ps=1.136e+07u
-M1001 a_84_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.0286e+12p pd=1.018e+07u as=6.216e+11p ps=6.12e+06u
-M1002 a_69_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_69_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_69_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1005 VPWR A2 a_69_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_69_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_69_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=8.066e+11p ps=8.1e+06u
-M1009 a_84_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_69_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 a_69_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_84_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_84_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_84_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_84_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_69_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_69_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A2 a_69_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A1 a_84_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A1 a_84_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A1 a_84_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_84_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_69_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Y B1 a_69_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_69_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_84_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A2 a_69_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A1 a_84_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y B1 a_69_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A1 a_69_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_69_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR A1 a_69_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND A2 a_84_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VPWR A2 a_69_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_84_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_69_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_69_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_84_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND A2 a_84_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_69_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_1.cdl b/cells/a221o/sky130_fd_sc_ls__a221o_1.cdl
index 9e013c3..48067ab 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_1.cdl
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a221o_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB 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
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__a221o_1
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_1.netlist.tsv b/cells/a221o/sky130_fd_sc_ls__a221o_1.netlist.tsv
index 336a3c7..8be75d4 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_1.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a221o_1	A1:I A2:I B1:I B2:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a221o/sky130_fd_sc_ls__a221o_1.spice b/cells/a221o/sky130_fd_sc_ls__a221o_1.spice
index fd8641d..da2571f 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_1.spice
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a221o_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_509_392# B2 a_310_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.05e+11p pd=5.21e+06u as=6e+11p ps=5.2e+06u
-M1001 a_148_260# C1 VGND VNB nshort w=640000u l=150000u
-+  ad=4.192e+11p pd=3.87e+06u as=8.64875e+11p ps=5.71e+06u
-M1002 a_417_79# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1003 a_148_260# A1 a_417_79# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_148_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.961e+11p ps=2.01e+06u
-M1005 a_597_79# B1 a_148_260# VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1006 VGND B2 a_597_79# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_148_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.73e+11p pd=5.52e+06u as=3.08e+11p ps=2.79e+06u
-M1008 a_310_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_148_260# C1 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1010 VPWR A1 a_310_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_310_392# B1 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_509_392# B1 a_310_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_597_79# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_310_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_417_79# A1 a_148_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_148_260# B1 a_597_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VGND C1 a_148_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_310_392# B2 a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_509_392# C1 a_148_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VPWR A2 a_310_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VGND A2 a_417_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 X a_148_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 X a_148_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_2.cdl b/cells/a221o/sky130_fd_sc_ls__a221o_2.cdl
index 82a972a..80d2614 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_2.cdl
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a221o_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPB1 pndB B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 y B1 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
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 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
+MMNC0 y C1 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
-MMIPX X y VPB 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 y B1 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
-MMNB1 sndB1 B2 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
-MMNC0 y C1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a221o_2
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_2.netlist.tsv b/cells/a221o/sky130_fd_sc_ls__a221o_2.netlist.tsv
index 2484a9f..c32930f 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_2.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a221o_2	A1:I A2:I B1:I B2:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_2.spice b/cells/a221o/sky130_fd_sc_ls__a221o_2.spice
index 14e3488..876bbd0 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_2.spice
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a221o_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_316_392# B1 a_515_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=5.75e+11p ps=5.15e+06u
-M1001 VPWR A1 a_316_392# VPB phighvt w=1e+06u l=150000u
-+  ad=9.81e+11p pd=8.31e+06u as=0p ps=0u
-M1002 a_337_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=8.362e+11p ps=6.7e+06u
-M1003 a_515_392# B2 a_316_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_603_74# B1 a_89_260# VNB nshort w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=8.029e+11p ps=5.13e+06u
-M1005 a_89_260# C1 a_515_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1006 VGND B2 a_603_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_89_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1008 VPWR a_89_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_89_260# C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_316_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_89_260# A1 a_337_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_89_260# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1013 VGND a_89_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_89_260# B1 a_603_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_316_392# B2 a_515_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND a_89_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_89_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_316_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 X a_89_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_89_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_515_392# C1 a_89_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_515_392# B1 a_316_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_603_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND C1 a_89_260# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND A2 a_337_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_337_74# A1 a_89_260# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR A2 a_316_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_4.cdl b/cells/a221o/sky130_fd_sc_ls__a221o_4.cdl
index b8ab372..22b400d 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_4.cdl
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a221o_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt 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
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a221o_4
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_4.netlist.tsv b/cells/a221o/sky130_fd_sc_ls__a221o_4.netlist.tsv
index f7f38a3..4c0316a 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_4.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a221o_4	A1:I A2:I B1:I B2:I C1: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_4.spice b/cells/a221o/sky130_fd_sc_ls__a221o_4.spice
index 5ae76d1..f712eb2 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_4.spice
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__a221o_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_157_376# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=1.36e+12p pd=1.072e+07u as=2.157e+12p ps=1.483e+07u
-M1001 X a_154_135# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1002 a_157_376# B2 a_1102_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=1.44e+12p ps=1.088e+07u
-M1003 X a_154_135# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.62282e+12p ps=1.315e+07u
-M1004 a_154_135# A1 a_71_135# VNB nshort w=640000u l=150000u
-+  ad=5.376e+11p pd=5.52e+06u as=5.184e+11p ps=5.46e+06u
-M1005 a_157_376# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_71_135# A1 a_154_135# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_154_135# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1102_392# B2 a_157_376# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_154_135# B1 a_1346_123# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.632e+11p ps=5.6e+06u
-M1010 VPWR A2 a_157_376# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_154_135# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_157_376# B1 a_1102_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_154_135# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_154_135# C1 a_1102_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1015 a_1346_123# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B2 a_1346_123# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_157_376# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_154_135# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1346_123# B1 a_154_135# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_154_135# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1102_392# C1 a_154_135# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_71_135# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_154_135# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_154_135# C1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND C1 a_154_135# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A2 a_71_135# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1102_392# B1 a_157_376# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_157_376# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 X a_154_135# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_71_135# A1 a_154_135# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_71_135# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 X a_154_135# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_1102_392# B2 a_157_376# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 VPWR A2 a_157_376# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_154_135# A1 a_71_135# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND B2 a_1346_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_1346_123# B1 a_154_135# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_1102_392# C1 a_154_135# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_154_135# B1 a_1346_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 X a_154_135# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 X a_154_135# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_157_376# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VGND C1 a_154_135# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VPWR a_154_135# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VPWR a_154_135# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_1346_123# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VGND a_154_135# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_1102_392# B1 a_157_376# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 VGND a_154_135# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_157_376# B2 a_1102_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 VGND A2 a_71_135# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 a_154_135# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_157_376# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 a_154_135# C1 a_1102_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 a_157_376# B1 a_1102_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.cdl b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.cdl
index 77ba9ac..73210fd 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.cdl
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a221oi_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPB1 pndB B2 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB 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
-MMPB1 pndB B2 VPB 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
-MMPC0 Y C1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
-MMNC0 Y C1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 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
+MMNC0 Y C1 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_ls__a221oi_1
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.netlist.tsv b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.netlist.tsv
index 225abb9..b7c62a8 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a221oi_1	A1:I A2:I B1:I B2:I C1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a221oi/sky130_fd_sc_ls__a221oi_1.spice b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.spice
index 27210c0..5a4fb52 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.spice
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a221oi_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_263_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.856e+11p pd=8.48e+06u as=4.368e+11p ps=3.02e+06u
-M1001 a_263_368# B1 a_118_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.44e+11p ps=5.63e+06u
-M1002 Y B1 a_351_74# VNB nshort w=740000u l=150000u
-+  ad=8.695e+11p pd=5.31e+06u as=1.554e+11p ps=1.9e+06u
-M1003 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=0p ps=0u
-M1004 a_567_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=0p ps=0u
-M1005 VGND A2 a_567_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_118_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1007 a_351_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_263_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_118_368# B2 a_263_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR A2 a_263_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND B2 a_351_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_118_368# B1 a_263_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_263_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_567_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_351_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y C1 a_118_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y A1 a_567_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_263_368# B2 a_118_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.cdl b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.cdl
index 0f7a152..45e80ab 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.cdl
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a221oi_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPB1 pndB B2 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB 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
-MMPB1 pndB B2 VPB 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
-MMPC0 Y C1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
-MMNC0 Y C1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 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
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__a221oi_2
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.netlist.tsv b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.netlist.tsv
index db05145..8d6aed0 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a221oi_2	A1:I A2:I B1:I B2:I C1: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.spice b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.spice
index aec7efd..89e9a77 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.spice
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__a221oi_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_294_368# B1 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.3776e+12p pd=1.142e+07u as=1.288e+12p ps=1.126e+07u
-M1001 VGND B2 a_293_74# VNB nshort w=740000u l=150000u
-+  ad=7.696e+11p pd=6.52e+06u as=4.44e+11p ps=4.16e+06u
-M1002 a_29_368# B1 a_294_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_293_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=8.362e+11p ps=8.18e+06u
-M1004 a_294_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=9.52e+11p ps=8.42e+06u
-M1005 a_675_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=7.03e+11p pd=4.86e+06u as=0p ps=0u
-M1006 Y A1 a_675_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_675_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_293_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_294_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_294_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_29_368# B2 a_294_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_675_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_294_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 a_293_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1017 a_29_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_294_368# B2 a_29_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_294_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_294_368# B1 a_29_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_29_368# B1 a_294_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y B1 a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_294_368# B2 a_29_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A2 a_675_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_29_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_294_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_675_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 Y A1 a_675_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_29_368# B2 a_294_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 Y C1 a_29_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_675_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_293_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR A2 a_294_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VGND B2 a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_293_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR A1 a_294_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.cdl b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.cdl
index b61562c..ea6e1e1 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.cdl
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a221oi_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPB1 pndB B2 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 pndB B1 VPB phighvt 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
-MMPB1 pndB B2 VPB phighvt 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
-MMPC0 Y C1 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
-MMNC0 Y C1 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 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
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__a221oi_4
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.netlist.tsv b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.netlist.tsv
index fd31f47..37001e1 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a221oi_4	A1:I A2:I B1:I B2:I C1: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.spice b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.spice
index 4e9a3fc..4a74db2 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.spice
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__a221oi_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_114_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.016e+12p pd=1.704e+07u as=9.52e+11p ps=8.42e+06u
-M1001 a_531_368# B1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.968e+12p pd=2.546e+07u as=0p ps=0u
-M1002 VGND A2 a_534_74# VNB nshort w=740000u l=150000u
-+  ad=1.2432e+12p pd=1.224e+07u as=1.0138e+12p ps=1.014e+07u
-M1003 a_531_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.6016e+12p ps=1.182e+07u
-M1004 a_1326_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=0p ps=0u
-M1005 a_531_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_534_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B2 a_1326_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1326_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.4282e+12p ps=1.422e+07u
-M1009 a_534_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1326_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_114_368# B2 a_531_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_114_368# B2 a_531_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_531_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_114_368# B1 a_531_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A2 a_531_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_531_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_534_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_531_368# B2 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_534_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1326_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_531_368# B2 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B2 a_1326_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A1 a_534_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_531_368# B1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B1 a_1326_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A1 a_531_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_531_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_114_368# B1 a_531_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y A1 a_534_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_534_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_114_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y C1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y B1 a_1326_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A2 a_531_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_531_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_534_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y C1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_114_368# B2 a_531_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_1326_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y B1 a_1326_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_1326_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_531_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_531_368# B2 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_1326_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y C1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VGND B2 a_1326_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_531_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_531_368# B1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_531_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VPWR A1 a_531_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_531_368# B1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 Y B1 a_1326_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_1326_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_114_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_534_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 Y A1 a_534_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 VGND A2 a_534_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_114_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_531_368# B2 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_114_368# B2 a_531_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 VPWR A2 a_531_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 VGND B2 a_1326_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_114_368# B1 a_531_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 Y A1 a_534_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 a_531_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 a_534_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 VPWR A2 a_531_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 a_114_368# B1 a_531_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X38 a_534_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 VGND A2 a_534_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_1.cdl b/cells/a222o/sky130_fd_sc_ls__a222o_1.cdl
index 300e12e..c111c89 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_1.cdl
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__a222o_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 y C2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 y C2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y 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
-MI10 net68 C2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 net68 C2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a222o_1
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_1.netlist.tsv b/cells/a222o/sky130_fd_sc_ls__a222o_1.netlist.tsv
index 1bb98b0..62200cd 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_1.netlist.tsv
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__a222o_1	A1:I A2:I B1:I B2:I C1:I C2: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	y	C2	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	net68	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net68	C2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	C2	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	net68	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net68	C2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_1.spice b/cells/a222o/sky130_fd_sc_ls__a222o_1.spice
index d14ef45..0aca916 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_1.spice
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a222o_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR X
-M1000 X a_32_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=9.082e+11p ps=5.52e+06u
-M1001 VGND A2 a_651_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1002 a_27_390# B1 a_337_390# VPB phighvt w=1e+06u l=150000u
-+  ad=9.4e+11p pd=7.88e+06u as=7.4e+11p ps=5.48e+06u
-M1003 a_337_390# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=8.154e+11p ps=5.8e+06u
-M1004 a_651_74# A1 a_32_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=6.848e+11p ps=4.7e+06u
-M1005 X a_32_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1006 a_119_74# C1 a_32_74# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1007 a_386_74# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1008 a_32_74# B1 a_386_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_32_74# C1 a_27_390# VPB phighvt w=1e+06u l=150000u
-+  ad=4.55e+11p pd=2.91e+06u as=0p ps=0u
-M1010 VPWR A2 a_337_390# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_390# C2 a_32_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_337_390# B2 a_27_390# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND C2 a_119_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_390# C1 a_32_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_337_390# B1 a_27_390# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND B2 a_386_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_32_74# C2 a_27_390# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR A1 a_337_390# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_32_74# A1 a_651_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_119_74# C2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_32_74# C1 a_119_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_27_390# B2 a_337_390# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_651_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_337_390# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND a_32_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_386_74# B1 a_32_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_32_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_2.cdl b/cells/a222o/sky130_fd_sc_ls__a222o_2.cdl
index 3379244..dc0e6db 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_2.cdl
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__a222o_2 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 y C2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 y C2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y 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
-MI10 net68 C2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 net68 C2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a222o_2
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_2.netlist.tsv b/cells/a222o/sky130_fd_sc_ls__a222o_2.netlist.tsv
index 0b71158..974a760 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_2.netlist.tsv
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__a222o_2	A1:I A2:I B1:I B2:I C1:I C2: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	y	C2	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	net68	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net68	C2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	C2	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	net68	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net68	C2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_2.spice b/cells/a222o/sky130_fd_sc_ls__a222o_2.spice
index b43cf5b..2a21334 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_2.spice
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__a222o_2 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR X
-M1000 X a_27_82# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=1.16865e+12p ps=9.01e+06u
-M1001 a_114_82# C1 a_27_82# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=4.832e+11p ps=4.07e+06u
-M1002 X a_27_82# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=9.428e+11p ps=7.49e+06u
-M1003 a_27_82# A1 a_557_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.795e+11p ps=3.77e+06u
-M1004 VPWR a_27_82# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_116_392# B1 a_639_368# VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=9.635e+11p ps=6.17e+06u
-M1006 VGND a_27_82# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B2 a_775_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1008 a_639_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_775_74# B1 a_27_82# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_639_368# B2 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C2 a_114_82# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_82# C2 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=5.9e+11p pd=5.18e+06u as=0p ps=0u
-M1013 a_116_392# C1 a_27_82# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_639_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_557_74# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_116_392# B2 a_639_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_639_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_557_74# A1 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 X a_27_82# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_27_82# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A2 a_557_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 X a_27_82# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_82# B1 a_775_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_639_368# B1 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_114_82# C2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_27_82# C1 a_114_82# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_27_82# C1 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VPWR A1 a_639_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 VPWR a_27_82# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_116_392# C2 a_27_82# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_775_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.cdl b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.cdl
index 56ecab6..0340741 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.cdl
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a222oi_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Y C2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Y C2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net62 C2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 net62 C2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a222oi_1
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.netlist.tsv b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.netlist.tsv
index 3907c38..2fd83a1 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.netlist.tsv
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a222oi_1	A1:I A2:I B1:I B2:I C1:I C2: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	C2	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	net62	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net62	C2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Y	C2	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	net62	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net62	C2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.spice b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.spice
index fbc1577..1e46827 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.spice
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a222oi_1 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
-M1000 a_461_74# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=9.312e+11p ps=5.47e+06u
-M1001 a_116_392# B2 a_369_392# VPB phighvt w=1e+06u l=150000u
-+  ad=7e+11p pd=5.4e+06u as=9.4e+11p ps=7.88e+06u
-M1002 a_119_74# C1 Y VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=5.92e+11p ps=4.41e+06u
-M1003 Y B1 a_461_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_369_392# B1 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_697_74# A1 Y VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1006 VGND A2 a_697_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_369_392# VPB phighvt w=1e+06u l=150000u
-+  ad=4.5e+11p pd=2.9e+06u as=0p ps=0u
-M1008 Y C2 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.4e+11p pd=5.28e+06u as=0p ps=0u
-M1009 a_116_392# C1 Y VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_369_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C2 a_119_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_116_392# B1 a_369_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR A2 a_369_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_369_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_119_74# C2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_697_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 Y C1 a_119_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_461_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 Y C1 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND B2 a_461_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 Y A1 a_697_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_116_392# C2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_369_392# B2 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.cdl b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.cdl
index 5deef35..b73ac18 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.cdl
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a222oi_2 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I C2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 pndB B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 Y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Y C2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Y C2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 Y C1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net62 C2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 net62 C2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a222oi_2
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.netlist.tsv b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.netlist.tsv
index 8307f72..c72dba6 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.netlist.tsv
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a222oi_2	A1:I A2:I B1:I B2:I C1:I C2: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	C2	pndB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	net62	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net62	C2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Y	C2	pndB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	net62	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net62	C2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.spice b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.spice
index f77d084..be1fffa 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.spice
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__a222oi_2 A1 A2 B1 B2 C1 C2 VGND VNB VPB VPWR Y
-M1000 a_137_74# C1 Y VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=7.232e+11p ps=7.38e+06u
-M1001 a_116_392# B2 a_515_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.29e+12p pd=1.058e+07u as=1.49e+12p ps=1.298e+07u
-M1002 a_981_74# A1 Y VNB nshort w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=0p ps=0u
-M1003 a_116_392# C1 Y VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=9.7e+11p ps=7.94e+06u
-M1004 a_515_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6.3e+11p ps=5.26e+06u
-M1005 Y A1 a_981_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C2 a_137_74# VNB nshort w=640000u l=150000u
-+  ad=1.01862e+12p pd=8.5e+06u as=0p ps=0u
-M1007 VGND B2 a_593_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1008 a_137_74# C2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C1 a_137_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C2 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_515_392# B1 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A2 a_515_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_593_74# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y C1 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_116_392# B1 a_515_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_116_392# C2 Y VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_515_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_593_74# B1 Y VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_515_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B1 a_593_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_515_392# B2 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A2 a_981_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_981_74# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_515_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 Y C1 a_137_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 Y B1 a_593_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_116_392# B2 a_515_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_137_74# C2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR A1 a_515_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_116_392# C2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND C2 a_137_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_593_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VPWR A2 a_515_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_116_392# B1 a_515_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VGND B2 a_593_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_593_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 VGND A2 a_981_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 Y C2 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_981_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 Y A1 a_981_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_515_392# B2 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_515_392# B1 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 a_981_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_137_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_116_392# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_515_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_1.cdl b/cells/a22o/sky130_fd_sc_ls__a22o_1.cdl
index 30d9258..3c43ae8 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_1.cdl
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB1 y B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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_ls__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_1.netlist.tsv b/cells/a22o/sky130_fd_sc_ls__a22o_1.netlist.tsv
index 97df744..a046e42 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_1.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a22o/sky130_fd_sc_ls__a22o_1.spice b/cells/a22o/sky130_fd_sc_ls__a22o_1.spice
index 3a0c35e..49e6de7 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_1.spice
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a22o_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VGND A2 a_52_123# VNB nshort w=640000u l=150000u
-+  ad=4.426e+11p pd=4.38e+06u as=3.52e+11p ps=3.66e+06u
-M1001 a_222_392# B2 a_132_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.3e+11p pd=2.66e+06u as=6.9e+11p ps=5.38e+06u
-M1002 VPWR A1 a_132_392# VPB phighvt w=1e+06u l=150000u
-+  ad=8.88e+11p pd=5.95e+06u as=0p ps=0u
-M1003 a_230_79# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1004 a_132_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_52_123# A1 a_222_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1006 X a_222_392# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1007 a_132_392# B1 a_222_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_222_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1009 a_222_392# B1 a_230_79# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_222_392# B1 a_132_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND a_222_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_222_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_132_392# B2 a_222_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR A2 a_132_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND B2 a_230_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_230_79# B1 a_222_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_52_123# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_132_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_222_392# A1 a_52_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_2.cdl b/cells/a22o/sky130_fd_sc_ls__a22o_2.cdl
index 27fa977..5ef85fa 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_2.cdl
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a22o_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB1 y B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 y B1 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 y B1 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
-MMNB1 sndB1 B2 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 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
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a22o_2
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_2.netlist.tsv b/cells/a22o/sky130_fd_sc_ls__a22o_2.netlist.tsv
index 3c490f0..9d54e89 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_2.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a22o_2	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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_2.spice b/cells/a22o/sky130_fd_sc_ls__a22o_2.spice
index 09a6754..06a9709 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_2.spice
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a22o_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR A2 a_388_368# VPB phighvt w=1e+06u l=150000u
-+  ad=1.0048e+12p pd=8.36e+06u as=6.7e+11p ps=5.34e+06u
-M1001 a_81_48# B1 a_388_368# VPB phighvt w=1e+06u l=150000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
-M1002 X a_81_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1003 a_388_368# B2 a_81_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_304_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=6.808e+11p ps=6.28e+06u
-M1005 VPWR a_81_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_491_74# B1 a_81_48# VNB nshort w=740000u l=150000u
-+  ad=1.85e+11p pd=1.98e+06u as=2.59e+11p ps=2.18e+06u
-M1007 a_81_48# A1 a_304_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_81_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1009 a_388_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_491_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_81_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_81_48# B1 a_491_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_491_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_81_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_388_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_388_368# B1 a_81_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 X a_81_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_304_74# A1 a_81_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND A2 a_304_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_81_48# B2 a_388_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VGND a_81_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR a_81_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR A1 a_388_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_4.cdl b/cells/a22o/sky130_fd_sc_ls__a22o_4.cdl
index def7a70..8337d28 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_4.cdl
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a22o_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB1 y B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a22o_4
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_4.netlist.tsv b/cells/a22o/sky130_fd_sc_ls__a22o_4.netlist.tsv
index 8d07527..c307406 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_4.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a22o_4	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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_4.spice b/cells/a22o/sky130_fd_sc_ls__a22o_4.spice
index c0fd5d5..fc63a91 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_4.spice
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__a22o_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_95_306# B1 a_645_120# VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=3.89825e+11p ps=3.8e+06u
-M1001 a_1064_123# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=1.217e+12p ps=1.055e+07u
-M1002 X a_95_306# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1003 a_95_306# A1 a_1064_123# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_95_306# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_555_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.767e+12p pd=1.405e+07u as=1.48e+12p ps=1.296e+07u
-M1006 VPWR A2 a_555_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_95_306# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1008 VPWR a_95_306# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_95_306# B2 a_555_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1010 a_95_306# B1 a_555_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_555_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_555_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_95_306# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_555_392# B1 a_95_306# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_555_392# B2 a_95_306# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1064_123# A1 a_95_306# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_95_306# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_645_120# B1 a_95_306# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_95_306# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_95_306# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND B2 a_645_120# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A2 a_1064_123# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_645_120# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_95_306# B2 a_555_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR A2 a_555_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VPWR a_95_306# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND B2 a_645_120# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_555_392# B2 a_95_306# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_645_120# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VGND a_95_306# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND a_95_306# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_95_306# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_1064_123# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_645_120# B1 a_95_306# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VGND A2 a_1064_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_95_306# A1 a_1064_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_555_392# B1 a_95_306# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 X a_95_306# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 X a_95_306# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 X a_95_306# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_95_306# B1 a_555_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_555_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VPWR A1 a_555_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 a_95_306# B1 a_645_120# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 X a_95_306# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_555_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_1064_123# A1 a_95_306# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.cdl b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.cdl
index 157c86f..80b1746 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.cdl
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMPB1 Y B2 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 Y B1 VPB 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
-MMPB1 Y B2 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
+MMNB1 sndB1 B2 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_ls__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.netlist.tsv b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.netlist.tsv
index de567dc..2e91bfc 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	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/a22oi/sky130_fd_sc_ls__a22oi_1.spice b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.spice
index 865f65f..c0cd3f9 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.spice
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__a22oi_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B1 a_159_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1001 a_159_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=3.922e+11p ps=4.02e+06u
-M1002 VPWR A1 a_71_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.368e+11p pd=3.02e+06u as=9.856e+11p ps=8.48e+06u
-M1003 a_339_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1004 Y B2 a_71_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1005 a_71_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_339_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_71_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A1 a_339_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_339_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR A2 a_71_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Y B1 a_71_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_71_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND B2 a_159_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_159_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_71_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.cdl b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.cdl
index a5907fb..c5b4a3a 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.cdl
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a22oi_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMPB1 Y B2 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 Y B1 VPB 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
-MMPB1 Y B2 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
+MMNB1 sndB1 B2 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
 .ENDS sky130_fd_sc_ls__a22oi_2
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.netlist.tsv b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.netlist.tsv
index 1953a35..807b246 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a22oi_2	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.spice b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.spice
index 9f40619..69b9e21 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.spice
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__a22oi_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_148_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=4.662e+11p ps=4.22e+06u
-M1001 Y A1 a_148_74# VNB nshort w=740000u l=150000u
-+  ad=7.918e+11p pd=6.58e+06u as=0p ps=0u
-M1002 VPWR A1 a_66_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0192e+12p pd=6.3e+06u as=1.624e+12p ps=1.41e+07u
-M1003 VGND A2 a_148_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_558_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=4.958e+11p pd=4.3e+06u as=0p ps=0u
-M1005 a_66_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_66_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=5.74e+06u
-M1007 Y B1 a_558_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_66_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B2 a_558_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A2 a_66_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B2 a_66_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B1 a_66_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_66_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_148_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_558_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B2 a_66_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_148_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR A2 a_66_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_148_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_66_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_66_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y B1 a_558_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_558_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND B2 a_558_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_66_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND A2 a_148_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_66_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR A1 a_66_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_558_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y B1 a_66_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 Y A1 a_148_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.cdl b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.cdl
index 9df37fa..1b0075b 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.cdl
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a22oi_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPB0 Y B1 VPB 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
+MMPB1 Y B2 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNB0 Y B1 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
-MMPB0 Y B1 VPB phighvt 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
-MMPB1 Y B2 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
+MMNB1 sndB1 B2 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
 .ENDS sky130_fd_sc_ls__a22oi_4
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.netlist.tsv b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.netlist.tsv
index d7ef899..2d664f5 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a22oi_4	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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.spice b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.spice
index 27baa1e..837ec92 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.spice
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__a22oi_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_45_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.968e+12p pd=2.546e+07u as=1.344e+12p ps=1.136e+07u
-M1001 VPWR A1 a_45_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.6016e+12p pd=1.182e+07u as=0p ps=0u
-M1002 a_45_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_45_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_48_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=8.288e+11p ps=8.16e+06u
-M1005 a_45_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_48_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B2 a_48_74# VNB nshort w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=0p ps=0u
-M1008 Y B1 a_45_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_45_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B2 a_45_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B2 a_45_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_840_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=1.0138e+12p pd=1.014e+07u as=0p ps=0u
-M1013 a_48_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_840_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_840_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_45_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_48_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A2 a_840_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A1 a_840_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_45_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_45_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A1 a_45_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B1 a_48_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_48_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 a_45_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A1 a_840_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A2 a_45_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND B2 a_48_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_840_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_840_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_45_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_45_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y B2 a_45_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_45_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_45_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_45_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_840_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_48_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_45_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND B2 a_48_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_48_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 Y B1 a_48_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_45_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_45_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_45_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_840_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y A1 a_840_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR A2 a_45_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_48_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_840_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 Y B1 a_48_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND A2 a_840_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR A1 a_45_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VPWR A1 a_45_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 Y B1 a_45_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_840_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 Y B1 a_45_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_45_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 VGND A2 a_840_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 Y A1 a_840_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VGND B2 a_48_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 Y B2 a_45_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_48_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.cdl b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.cdl
index ec8a144..a8e9895 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a2bb2o_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMNnor0 inor A1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB 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
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi20 y inor VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a2bb2o_1
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.netlist.tsv
index ee33221..16aca32 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a2bb2o_1	A1_N:I A2_N: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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.spice b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.spice
index ef27326..fe8a484 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.spice
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a2bb2o_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR B2 a_530_392# VPB phighvt w=1e+06u l=150000u
-+  ad=7.28e+11p pd=5.63e+06u as=5.75e+11p ps=5.15e+06u
-M1001 a_93_264# a_257_126# VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=8.3095e+11p ps=6.71e+06u
-M1002 a_605_126# B2 a_93_264# VNB nshort w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1003 a_257_126# A1_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=0p ps=0u
-M1004 a_530_392# a_257_126# a_93_264# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1005 VGND A2_N a_257_126# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_257_126# A2_N a_258_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=2.4e+11p ps=2.48e+06u
-M1007 VGND a_93_264# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.961e+11p ps=2.01e+06u
-M1008 VGND B1 a_605_126# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_530_392# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_93_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1011 a_258_392# A1_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_258_392# A2_N a_257_126# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_605_126# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_530_392# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_93_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_93_264# a_257_126# a_530_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VPWR A1_N a_258_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 VGND A1_N a_257_126# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 VGND a_257_126# a_93_264# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_257_126# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 VPWR B1 a_530_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_93_264# B2 a_605_126# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 X a_93_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.cdl b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.cdl
index 777407e..363d047 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a2bb2o_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMNnor0 inor A1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 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
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 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
-MMNaoi20 y inor 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
-MMPaoi20 y inor VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB 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
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 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
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi20 y inor 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
-MMPaoi10 pmid B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a2bb2o_2
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.netlist.tsv
index 761633b..9b9f831 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a2bb2o_2	A1_N:I A2_N: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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.spice b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.spice
index 3c12c0c..daad3a5 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.spice
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a2bb2o_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_221_74# B2 a_149_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1001 a_61_392# B2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.75e+11p pd=5.15e+06u as=9.998e+11p ps=8.35e+06u
-M1002 a_546_378# A2_N a_293_333# VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.75e+11p ps=2.55e+06u
-M1003 VPWR A1_N a_546_378# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_293_333# A2_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=1.184e+12p ps=9.5e+06u
-M1005 VGND a_293_333# a_221_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_221_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1007 a_149_74# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_221_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1009 VGND A1_N a_293_333# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_221_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 a_61_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_221_74# a_293_333# a_61_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1013 X a_221_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2_N a_293_333# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 a_293_333# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 VGND a_221_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_61_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR a_221_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_149_74# B2 a_221_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_221_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND B1 a_149_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_61_392# a_293_333# a_221_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_293_333# A2_N a_546_378# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 VPWR B2 a_61_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_221_74# a_293_333# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_546_378# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 X a_221_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.cdl b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.cdl
index a01a00c..d52716a 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a2bb2o_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMNnor0 inor A1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor 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
-MMPaoi20 y inor VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt 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
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi20 y inor 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
-MMPaoi10 pmid B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPaoi20 y inor VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=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
-MMPaoi11 pmid B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__a2bb2o_4
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.netlist.tsv
index 9edfecf..c11a31a 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a2bb2o_4	A1_N:I A2_N: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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.spice b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.spice
index 7631f1e..a27aa8d 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.spice
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.spice
@@ -16,50 +16,27 @@
 
 
 .subckt sky130_fd_sc_ls__a2bb2o_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR B1 a_820_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.6808e+12p pd=1.385e+07u as=1.15e+12p ps=1.03e+07u
-M1001 VGND a_162_48# X VNB nshort w=740000u l=150000u
-+  ad=1.6403e+12p pd=1.199e+07u as=4.144e+11p ps=4.08e+06u
-M1002 a_1009_74# B2 a_162_48# VNB nshort w=640000u l=150000u
-+  ad=5.184e+11p pd=5.46e+06u as=3.753e+11p ps=3.85e+06u
-M1003 X a_162_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1004 a_586_94# A2_N a_583_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=2.688e+11p ps=2.72e+06u
-M1005 a_820_392# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_162_48# a_586_94# a_820_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1007 a_1009_74# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_162_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1 a_1009_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_162_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_162_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_162_48# B2 a_1009_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_586_94# A1_N VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1014 a_820_392# a_586_94# a_162_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_162_48# a_586_94# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B2 a_820_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_162_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_583_368# A1_N VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_162_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_820_392# B2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A2_N a_586_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_162_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_586_94# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR A1_N a_583_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_820_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_162_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_820_392# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND a_162_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_162_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 X a_162_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 X a_162_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND a_586_94# a_162_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_1009_74# B2 a_162_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VGND B1 a_1009_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 VPWR B1 a_820_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_820_392# a_586_94# a_162_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 VPWR B2 a_820_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_583_368# A2_N a_586_94# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VPWR a_162_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_162_48# B2 a_1009_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_1009_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VPWR a_162_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND a_162_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_162_48# a_586_94# a_820_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 VGND A1_N a_586_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.cdl b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.cdl
index 477936b..fdc3ef7 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a2bb2oi_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 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
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 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
-MMNaoi20 Y inor 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
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 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
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inor 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
-MMPaoi10 pmid B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB 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
+MMPaoi11 pmid B2 VPB 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
+MMPaoi20 Y inor VPB 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
 .ENDS sky130_fd_sc_ls__a2bb2oi_1
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.netlist.tsv
index 03f484e..02f9ba1 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a2bb2oi_1	A1_N:I A2_N: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
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.spice b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.spice
index b1f0165..3243b1d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a2bb2oi_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 Y a_126_112# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.322e+11p ps=6.72e+06u
-M1001 VGND B1 a_488_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1002 a_399_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.44e+11p pd=5.63e+06u as=6.446e+11p ps=5.45e+06u
-M1003 a_488_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_117_392# A1_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1005 a_399_368# a_126_112# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1006 a_126_112# A2_N a_117_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1007 VGND A2_N a_126_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.54e+11p ps=1.66e+06u
-M1008 a_126_112# A1_N VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B2 a_399_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_399_368# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_117_392# A2_N a_126_112# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VPWR B1 a_399_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND A1_N a_126_112# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 Y B2 a_488_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_126_112# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 Y a_126_112# a_399_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR A1_N a_117_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_488_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_126_112# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.cdl b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.cdl
index 485f36c..98dd25e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a2bb2oi_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 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
-MMNaoi11 sndNB1 B2 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 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
-MMNaoi20 Y inor 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
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 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
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inor 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
-MMPaoi10 pmid B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB 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
+MMPaoi11 pmid B2 VPB 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
+MMPaoi20 Y inor VPB 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
 .ENDS sky130_fd_sc_ls__a2bb2oi_2
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.netlist.tsv
index a54b078..c6f359f 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a2bb2oi_2	A1_N:I A2_N: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
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.spice b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.spice
index 958a5fa..44ece0a 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__a2bb2oi_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_424_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.288e+12p pd=1.126e+07u as=9.47e+11p ps=8.23e+06u
-M1001 a_424_368# a_212_102# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1002 Y B2 a_615_74# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=5.994e+11p ps=6.06e+06u
-M1003 VPWR B2 a_424_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_212_102# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=8.17e+11p ps=8.02e+06u
-M1005 a_209_392# A1_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1006 a_615_74# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_615_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2_N a_212_102# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.08e+11p ps=1.93e+06u
-M1009 a_424_368# B2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_212_102# A1_N VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_212_102# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 a_424_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_212_102# A2_N a_209_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1014 VGND B1 a_615_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_212_102# a_424_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B2 a_424_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A1_N a_209_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 Y a_212_102# a_424_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_615_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_212_102# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 Y B2 a_615_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_424_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_615_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_424_368# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_424_368# a_212_102# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_209_392# A2_N a_212_102# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND B1 a_615_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VGND A1_N a_212_102# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VGND a_212_102# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y a_212_102# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR B1 a_424_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.cdl b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.cdl
index 35ddefa..44303d1 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a2bb2oi_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnor0 inor A1_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N 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
-MMNnor1 inor A2_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N 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
-MMNaoi10 VGND B1 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
-MMNaoi11 sndNB1 B2 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 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
-MMNaoi20 Y inor 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
-MMPnor0 VPWR A1_N VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 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
-MMPnor1 sndPA1N A2_N VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inor 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
-MMPaoi10 pmid B1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB phighvt 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
+MMPaoi11 pmid B2 VPB 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
+MMPaoi20 Y inor VPB 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
 .ENDS sky130_fd_sc_ls__a2bb2oi_4
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.netlist.tsv
index 3dfdcb7..503436b 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a2bb2oi_4	A1_N:I A2_N: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
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.spice b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.spice
index 1ef5b75..a0b952e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ls__a2bb2oi_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 Y a_114_392# a_539_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=2.296e+12p ps=1.978e+07u
-M1001 a_539_368# B2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.644e+12p ps=1.396e+07u
-M1002 VGND a_114_392# Y VNB nshort w=740000u l=150000u
-+  ad=1.2654e+12p pd=1.23e+07u as=8.288e+11p ps=8.16e+06u
-M1003 Y a_114_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1_N a_114_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1005 VPWR A1_N a_29_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=8.5e+11p ps=7.7e+06u
-M1006 a_539_368# a_114_392# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1 a_539_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B2 a_914_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.0138e+12p ps=1.014e+07u
-M1009 VPWR B1 a_539_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B1 a_914_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_914_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_914_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_29_392# A1_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_114_392# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_539_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B2 a_539_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_539_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_539_368# B2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y a_114_392# a_539_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B1 a_914_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B2 a_539_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_114_392# A2_N VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_114_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_539_368# a_114_392# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_914_74# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_114_392# A2_N a_29_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1027 a_29_392# A2_N a_114_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_914_74# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B2 a_914_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_539_368# a_114_392# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR B2 a_539_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_539_368# a_114_392# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR B2 a_539_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y a_114_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_29_392# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 Y B2 a_914_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR B1 a_539_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND B1 a_914_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_914_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND a_114_392# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_539_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_29_392# A2_N a_114_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 Y a_114_392# a_539_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Y a_114_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND a_114_392# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_539_368# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_914_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 Y a_114_392# a_539_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 Y B2 a_914_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_914_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_914_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VGND B1 a_914_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VGND A2_N a_114_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VPWR A1_N a_29_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_114_392# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_114_392# A2_N a_29_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 a_539_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_539_368# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 VPWR B1 a_539_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_1.cdl b/cells/a311o/sky130_fd_sc_ls__a311o_1.cdl
index 3684507..24b63f0 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_1.cdl
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a311o_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB 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
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__a311o_1
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_1.netlist.tsv b/cells/a311o/sky130_fd_sc_ls__a311o_1.netlist.tsv
index 7a9cb88..a4dd732 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_1.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a311o_1	A1:I A2:I A3:I B1:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a311o/sky130_fd_sc_ls__a311o_1.spice b/cells/a311o/sky130_fd_sc_ls__a311o_1.spice
index f912c64..143899d 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_1.spice
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a311o_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_89_270# C1 VGND VNB nshort w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=5.289e+11p ps=4.33e+06u
-M1001 a_264_120# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=2.10625e+11p pd=1.96e+06u as=0p ps=0u
-M1002 VPWR A2 a_258_392# VPB phighvt w=1e+06u l=150000u
-+  ad=9.518e+11p pd=6.08e+06u as=6e+11p ps=5.2e+06u
-M1003 VGND a_89_270# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.961e+11p ps=2.01e+06u
-M1004 a_89_270# A1 a_359_123# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1005 a_258_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_546_392# B1 a_258_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 a_89_270# C1 a_546_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1008 a_359_123# A2 a_264_120# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_258_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_89_270# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1011 VGND B1 a_89_270# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_89_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_359_123# A1 a_89_270# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_258_392# B1 a_546_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_546_392# C1 a_89_270# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR A3 a_258_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND C1 a_89_270# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 X a_89_270# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR A1 a_258_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND A3 a_264_120# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_264_120# A2 a_359_123# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_258_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_89_270# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_2.cdl b/cells/a311o/sky130_fd_sc_ls__a311o_2.cdl
index baa6251..7d2c7f9 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_2.cdl
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a311o_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 y B1 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
-MMPC0 y C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 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
-MMIPX X y VPB 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 y B1 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
-MMNC0 y C1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a311o_2
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_2.netlist.tsv b/cells/a311o/sky130_fd_sc_ls__a311o_2.netlist.tsv
index e90ec12..12d3d31 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_2.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a311o_2	A1:I A2:I A3:I B1:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_2.spice b/cells/a311o/sky130_fd_sc_ls__a311o_2.spice
index 8bb63ca..dd0e90b 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_2.spice
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a311o_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR A2 a_330_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.251e+12p pd=8.85e+06u as=6.6e+11p ps=5.32e+06u
-M1001 a_423_74# A2 a_351_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1002 a_21_270# C1 a_660_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=2.7e+11p ps=2.54e+06u
-M1003 VGND a_21_270# X VNB nshort w=740000u l=150000u
-+  ad=7.955e+11p pd=6.59e+06u as=2.072e+11p ps=2.04e+06u
-M1004 VGND B1 a_21_270# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.847e+11p ps=4.27e+06u
-M1005 a_660_392# B1 a_330_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_351_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_21_270# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1008 a_21_270# C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_21_270# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_21_270# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_330_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_21_270# A1 a_423_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_330_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_21_270# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND A3 a_351_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_21_270# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_351_74# A2 a_423_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND C1 a_21_270# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 X a_21_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR a_21_270# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_660_392# C1 a_21_270# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VPWR A1 a_330_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VPWR A3 a_330_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_330_392# B1 a_660_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND a_21_270# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_423_74# A1 a_21_270# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_330_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_4.cdl b/cells/a311o/sky130_fd_sc_ls__a311o_4.cdl
index 61066ed..e1da05e 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_4.cdl
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a311o_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 pndB B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 y C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt 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
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a311o_4
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_4.netlist.tsv b/cells/a311o/sky130_fd_sc_ls__a311o_4.netlist.tsv
index 8209b64..bdb493b 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_4.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a311o_4	A1:I A2:I A3:I B1:I C1: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_4.spice b/cells/a311o/sky130_fd_sc_ls__a311o_4.spice
index 560cfe3..e73b685 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_4.spice
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__a311o_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_154_392# VNB nshort w=640000u l=150000u
-+  ad=1.23862e+12p pd=1.191e+07u as=5.376e+11p ps=5.52e+06u
-M1001 VGND a_154_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1002 a_154_392# C1 a_69_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=8.5e+11p ps=7.7e+06u
-M1003 a_334_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=1.2e+12p pd=1.04e+07u as=1.947e+12p ps=1.641e+07u
-M1004 a_154_392# A1 a_1081_39# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=6.927e+11p ps=6.48e+06u
-M1005 a_1081_39# A1 a_154_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_334_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_154_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1008 a_69_392# C1 a_154_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_154_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_888_105# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1011 a_1081_39# A2 a_888_105# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_69_392# B1 a_334_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A2 a_334_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A3 a_888_105# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND C1 a_154_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_334_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_154_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_154_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_334_392# B1 a_69_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_888_105# A2 a_1081_39# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_154_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_154_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_154_392# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_154_392# C1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_154_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_334_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A3 a_334_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_69_392# C1 a_154_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 X a_154_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_154_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_334_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_1081_39# A2 a_888_105# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_1081_39# A1 a_154_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR A1 a_334_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_154_392# C1 a_69_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_154_392# A1 a_1081_39# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VPWR a_154_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND C1 a_154_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR A2 a_334_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_154_392# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_154_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND a_154_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND A3 a_888_105# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 X a_154_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND a_154_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR A3 a_334_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_154_392# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_334_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_888_105# A2 a_1081_39# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_334_392# B1 a_69_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 VGND B1 a_154_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 a_888_105# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_69_392# B1 a_334_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 a_334_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 X a_154_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.cdl b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.cdl
index 52dec09..f997041 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.cdl
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a311oi_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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
-MMPA2 pndA A3 VPB 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
-MMPB0 pndB B1 VPB 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
-MMPC0 Y C1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 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
-MMNC0 Y C1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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_ls__a311oi_1
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.netlist.tsv b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.netlist.tsv
index 5c703b3..a973ac9 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a311oi_1	A1:I A2:I A3:I B1:I C1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a311oi/sky130_fd_sc_ls__a311oi_1.spice b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.spice
index d438ca5..fa221ab 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.spice
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a311oi_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_231_74# A2 a_159_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.554e+11p ps=1.9e+06u
-M1001 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=4.847e+11p ps=4.27e+06u
-M1002 a_159_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y C1 a_462_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=3.696e+11p ps=2.9e+06u
-M1004 a_156_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=8.456e+11p ps=5.99e+06u
-M1005 Y A1 a_231_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_462_368# B1 a_156_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_156_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_156_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_231_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_156_368# B1 a_462_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_156_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND A3 a_159_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A1 a_156_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_159_74# A2 a_231_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR A3 a_156_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_462_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.cdl b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.cdl
index d337b1d..c90b818 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.cdl
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a311oi_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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
-MMPA2 pndA A3 VPB 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
-MMPB0 pndB B1 VPB 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
-MMPC0 Y C1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 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
-MMNC0 Y C1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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_ls__a311oi_2
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.netlist.tsv b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.netlist.tsv
index e524aa1..7c1bda2 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a311oi_2	A1:I A2:I A3:I B1:I C1: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a311oi/sky130_fd_sc_ls__a311oi_2.spice b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.spice
index 82b09e7..465532c 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.spice
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__a311oi_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_692_368# B1 a_127_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.52e+11p pd=8.42e+06u as=1.344e+12p ps=1.136e+07u
-M1001 Y C1 a_692_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1002 a_45_74# A2 a_300_74# VNB nshort w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=4.144e+11p ps=4.08e+06u
-M1003 a_692_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A3 a_45_74# VNB nshort w=740000u l=150000u
-+  ad=7.178e+11p pd=4.9e+06u as=0p ps=0u
-M1005 a_45_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_300_74# VNB nshort w=740000u l=150000u
-+  ad=5.994e+11p pd=6.06e+06u as=0p ps=0u
-M1007 a_127_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.3216e+12p ps=1.132e+07u
-M1008 VPWR A3 a_127_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_127_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_127_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_127_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_300_74# A2 a_45_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_127_368# B1 a_692_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_300_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A2 a_127_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_127_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A2 a_127_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_300_74# A2 a_45_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A3 a_127_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y A1 a_300_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_127_368# B1 a_692_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_45_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_127_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A1 a_127_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_300_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_127_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_692_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND A3 a_45_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_45_74# A2 a_300_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_692_368# B1 a_127_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 Y C1 a_692_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.cdl b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.cdl
index 2d41d93..39ba831 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.cdl
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a311oi_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 pndB B1 VPB 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
+MMPC0 Y C1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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
-MMPA2 pndA A3 VPB phighvt 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
-MMPB0 pndB B1 VPB phighvt 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
-MMPC0 Y C1 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 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
-MMNC0 Y C1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__a311oi_4
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.netlist.tsv b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.netlist.tsv
index 3e4dbe7..532122a 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a311oi_4	A1:I A2:I A3:I B1:I C1: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.spice b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.spice
index 1af89e0..2cd0dec 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.spice
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ls__a311oi_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_114_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.688e+12p pd=2.272e+07u as=2.296e+12p ps=1.978e+07u
-M1001 a_114_368# B1 a_1213_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.6464e+12p ps=1.414e+07u
-M1002 a_465_74# A2 a_34_74# VNB nshort w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=1.0286e+12p ps=1.018e+07u
-M1003 VGND A3 a_34_74# VNB nshort w=740000u l=150000u
-+  ad=1.4578e+12p pd=9.86e+06u as=0p ps=0u
-M1004 Y C1 VGND VNB nshort w=740000u l=150000u
-+  ad=1.0286e+12p pd=1.018e+07u as=0p ps=0u
-M1005 VPWR A2 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_465_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A3 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1213_368# B1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_34_74# A2 a_465_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A1 a_465_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_114_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_114_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C1 a_1213_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1016 a_114_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A3 a_34_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_114_368# B1 a_1213_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_465_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1213_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_34_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A2 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1213_368# C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_34_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1213_368# B1 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_114_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A3 a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_114_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y C1 a_1213_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_465_74# A2 a_34_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_34_74# A2 a_465_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y A1 a_465_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 a_1213_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A2 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_1213_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_465_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND A3 a_34_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR A3 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_1213_368# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_34_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_1213_368# B1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR A1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_465_74# A2 a_34_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_1213_368# B1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A3 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_114_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VGND A3 a_34_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Y A1 a_465_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_114_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_34_74# A2 a_465_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_465_74# A2 a_34_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_114_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_34_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 Y C1 a_1213_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_114_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_114_368# B1 a_1213_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_114_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_114_368# B1 a_1213_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_34_74# A2 a_465_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 Y A1 a_465_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 a_465_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_114_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VPWR A1 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 VPWR A2 a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_1.cdl b/cells/a31o/sky130_fd_sc_ls__a31o_1.cdl
index ab3b73c..fe2dd5c 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_1.cdl
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a31o_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB 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
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__a31o_1
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_1.netlist.tsv b/cells/a31o/sky130_fd_sc_ls__a31o_1.netlist.tsv
index ed8622a..b37e797 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_1.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a31o_1	A1:I A2:I A3: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a31o/sky130_fd_sc_ls__a31o_1.spice b/cells/a31o/sky130_fd_sc_ls__a31o_1.spice
index cd2e89c..f3048a5 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_1.spice
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a31o_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_81_270# VNB nshort w=640000u l=150000u
-+  ad=5.827e+11p pd=4.47e+06u as=2.816e+11p ps=2.16e+06u
-M1001 a_250_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=1.0418e+12p ps=6.26e+06u
-M1002 a_250_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_337_120# A2 a_265_120# VNB nshort w=640000u l=150000u
-+  ad=2.5125e+11p pd=2.09e+06u as=1.344e+11p ps=1.7e+06u
-M1004 a_81_270# B1 a_250_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1005 VGND a_81_270# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.961e+11p ps=2.01e+06u
-M1006 VPWR a_81_270# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1007 VPWR A2 a_250_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_265_120# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_81_270# A1 a_337_120# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_250_392# B1 a_81_270# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR A3 a_250_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_81_270# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_337_120# A1 a_81_270# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 X a_81_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_265_120# A2 a_337_120# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_250_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VPWR A1 a_250_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 X a_81_270# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND A3 a_265_120# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_2.cdl b/cells/a31o/sky130_fd_sc_ls__a31o_2.cdl
index 9a204c0..5592953 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_2.cdl
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a31o_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 y B1 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
-MMIPX X y VPB 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 y B1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a31o_2
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_2.netlist.tsv b/cells/a31o/sky130_fd_sc_ls__a31o_2.netlist.tsv
index 4a722ba..e8055ac 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_2.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a31o_2	A1:I A2:I A3: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_2.spice b/cells/a31o/sky130_fd_sc_ls__a31o_2.spice
index eaed879..1c9b329 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_2.spice
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a31o_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_362_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.5e+11p pd=5.3e+06u as=1.4332e+12p ps=9.17e+06u
-M1001 a_371_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=9.435e+11p ps=6.99e+06u
-M1002 VPWR a_97_296# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1003 a_97_296# B1 a_362_368# VPB phighvt w=1e+06u l=150000u
-+  ad=3.05e+11p pd=2.61e+06u as=0p ps=0u
-M1004 a_449_74# A2 a_371_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1005 X a_97_296# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_97_296# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1007 VGND a_97_296# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_362_368# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_97_296# A1 a_449_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1010 VPWR A2 a_362_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 a_97_296# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_97_296# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_97_296# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_362_368# B1 a_97_296# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VPWR a_97_296# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_362_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND a_97_296# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_371_74# A2 a_449_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_449_74# A1 a_97_296# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND A3 a_371_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 X a_97_296# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR A1 a_362_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VPWR A3 a_362_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_4.cdl b/cells/a31o/sky130_fd_sc_ls__a31o_4.cdl
index cf21154..3d79cf8 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_4.cdl
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a31o_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt 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
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a31o_4
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_4.netlist.tsv b/cells/a31o/sky130_fd_sc_ls__a31o_4.netlist.tsv
index 27178d1..c9aa345 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_4.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a31o_4	A1:I A2:I A3: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_4.spice b/cells/a31o/sky130_fd_sc_ls__a31o_4.spice
index 1361b9a..2d66b14 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_4.spice
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__a31o_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_83_274# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.3248e+12p pd=1.712e+07u as=6.72e+11p ps=5.68e+06u
-M1001 a_529_392# B1 a_83_274# VPB phighvt w=1e+06u l=150000u
-+  ad=1.69e+12p pd=1.338e+07u as=3.7e+11p ps=2.74e+06u
-M1002 a_83_274# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=5.888e+11p pd=5.68e+06u as=1.0507e+12p ps=1.001e+07u
-M1003 VGND A3 a_1000_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.44e+11p ps=5.54e+06u
-M1004 VPWR A3 a_529_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_775_74# A2 a_1000_74# VNB nshort w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=0p ps=0u
-M1006 VGND B1 a_83_274# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_83_274# VGND VNB nshort w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=0p ps=0u
-M1008 a_529_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_83_274# B1 a_529_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_83_274# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_83_274# A1 a_775_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1000_74# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_775_74# A1 a_83_274# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1000_74# A2 a_775_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_83_274# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_83_274# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_83_274# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A1 a_529_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_83_274# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_83_274# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_529_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A2 a_529_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_529_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1000_74# A2 a_775_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_775_74# A2 a_1000_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_529_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_83_274# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND B1 a_83_274# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_83_274# A1 a_775_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VGND a_83_274# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 X a_83_274# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_83_274# B1 a_529_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VPWR A3 a_529_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_1000_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR a_83_274# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND A3 a_1000_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_83_274# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_529_392# B1 a_83_274# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_529_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 VPWR A1 a_529_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 X a_83_274# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VPWR a_83_274# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 X a_83_274# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND a_83_274# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_529_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 VPWR A2 a_529_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_775_74# A1 a_83_274# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.cdl b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.cdl
index 9bfc52a..c4ef9d6 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.cdl
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a31oi_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB 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
-MMPA2 pndA A3 VPB 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
-MMPB0 Y B1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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_ls__a31oi_1
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.netlist.tsv b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.netlist.tsv
index be7911a..03d451f 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a31oi_1	A1:I A2:I A3: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a31oi/sky130_fd_sc_ls__a31oi_1.spice b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.spice
index 484e423..d54de2f 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.spice
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__a31oi_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_223_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=3.108e+11p ps=2.32e+06u
-M1001 a_136_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.28e+11p pd=5.78e+06u as=9.8e+11p ps=6.23e+06u
-M1002 a_223_74# A2 a_145_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1003 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=5.291e+11p pd=4.39e+06u as=0p ps=0u
-M1004 Y B1 a_136_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1005 VPWR A2 a_136_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_136_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_145_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_136_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_136_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR A3 a_136_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_136_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_223_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A3 a_145_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_145_74# A2 a_223_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.cdl b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.cdl
index 45ed24c..ee4b21e 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.cdl
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a31oi_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB 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
-MMPA2 pndA A3 VPB 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
-MMPB0 Y B1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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_ls__a31oi_2
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.netlist.tsv b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.netlist.tsv
index 1c631fe..9c7e9df 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a31oi_2	A1:I A2:I A3: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a31oi/sky130_fd_sc_ls__a31oi_2.spice b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.spice
index a4b46ad..0e4a75f 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.spice
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_ls__a31oi_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.7808e+12p pd=1.438e+07u as=1.0752e+12p ps=8.64e+06u
-M1001 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1002 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=7.548e+11p pd=5e+06u as=5.217e+11p ps=4.37e+06u
-M1003 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A1 a_200_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.773e+11p ps=4.25e+06u
-M1006 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A3 a_114_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1009 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_114_74# A2 a_200_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_114_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_200_74# A2 a_114_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_200_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A1 a_200_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_114_74# A2 a_200_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_200_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_114_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND A3 a_114_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_200_74# A2 a_114_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.cdl b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.cdl
index 9b3eee7..dcfe22b 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.cdl
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__a31oi_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt 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
-MMPA2 pndA A3 VPB phighvt 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
-MMPB0 Y B1 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__a31oi_4
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.netlist.tsv b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.netlist.tsv
index 1263344..5a61f2e 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__a31oi_4	A1:I A2:I A3: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.spice b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.spice
index 12ad03d..afdde3a 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.spice
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ls__a31oi_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.696e+12p pd=2.676e+07u as=6.944e+11p ps=5.72e+06u
-M1001 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=2.296e+12p ps=1.754e+07u
-M1002 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_475_74# A2 a_30_74# VNB nshort w=740000u l=150000u
-+  ad=1.1544e+12p pd=9.04e+06u as=1.03482e+12p ps=1.022e+07u
-M1005 a_475_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=9.2695e+11p ps=8.48e+06u
-M1006 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_30_74# A2 a_475_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_30_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.2839e+12p ps=7.91e+06u
-M1010 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A3 a_30_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_30_74# A2 a_475_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_475_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A1 a_475_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_475_74# A2 a_30_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A3 a_30_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_30_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A1 a_475_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_30_74# A2 a_475_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_475_74# A2 a_30_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND A3 a_30_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND A3 a_30_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_30_74# A2 a_475_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Y A1 a_475_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y A1 a_475_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_475_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_30_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_475_74# A2 a_30_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_475_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_30_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_1.cdl b/cells/a32o/sky130_fd_sc_ls__a32o_1.cdl
index 21c1e58..7850fca 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_1.cdl
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a32o_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB 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
-MMNA0 y A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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_ls__a32o_1
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_1.netlist.tsv b/cells/a32o/sky130_fd_sc_ls__a32o_1.netlist.tsv
index 81e1568..ad960b3 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_1.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a32o_1	A1:I A2:I A3: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a32o/sky130_fd_sc_ls__a32o_1.spice b/cells/a32o/sky130_fd_sc_ls__a32o_1.spice
index badc1c7..f0184df 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_1.spice
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a32o_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_244_368# B2 a_84_48# VPB phighvt w=1e+06u l=150000u
-+  ad=8.95e+11p pd=7.79e+06u as=4e+11p ps=2.8e+06u
-M1001 a_244_368# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=1.1114e+12p ps=6.38e+06u
-M1002 VPWR A2 a_244_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_84_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1004 a_601_94# B1 a_84_48# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=4.032e+11p ps=2.54e+06u
-M1005 a_259_94# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=6.004e+11p ps=4.48e+06u
-M1006 a_337_94# A2 a_259_94# VNB nshort w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1007 a_244_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B2 a_601_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_84_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1010 a_84_48# B1 a_244_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_84_48# A1 a_337_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_84_48# B1 a_601_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_244_368# B1 a_84_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_84_48# B2 a_244_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_259_94# A2 a_337_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR A3 a_244_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_337_94# A1 a_84_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 X a_84_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND A3 a_259_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_244_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VPWR A1 a_244_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 X a_84_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_601_94# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_2.cdl b/cells/a32o/sky130_fd_sc_ls__a32o_2.cdl
index 97b46f3..afc555a 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_2.cdl
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a32o_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPB1 y B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 y B1 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
-MMIPX X y VPB 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 y B1 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
-MMNB1 sndB1 B2 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 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
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a32o_2
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_2.netlist.tsv b/cells/a32o/sky130_fd_sc_ls__a32o_2.netlist.tsv
index 214402c..5501053 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_2.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a32o_2	A1:I A2:I A3: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_2.spice b/cells/a32o/sky130_fd_sc_ls__a32o_2.spice
index 04dc77e..1c7d015 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_2.spice
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a32o_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_661_74# B1 a_45_264# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=3.108e+11p ps=2.32e+06u
-M1001 VGND a_45_264# X VNB nshort w=740000u l=150000u
-+  ad=8.769e+11p pd=6.81e+06u as=2.146e+11p ps=2.06e+06u
-M1002 a_346_368# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=8.95e+11p pd=7.79e+06u as=1.4956e+12p ps=9.29e+06u
-M1003 a_346_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_355_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1005 a_433_74# A2 a_355_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1006 VPWR A2 a_346_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B2 a_661_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_45_264# B1 a_346_368# VPB phighvt w=1e+06u l=150000u
-+  ad=4e+11p pd=2.8e+06u as=0p ps=0u
-M1009 X a_45_264# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1010 VPWR a_45_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_45_264# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_346_368# B2 a_45_264# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_45_264# A1 a_433_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_355_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_45_264# B1 a_661_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_346_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_661_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR a_45_264# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A1 a_346_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 X a_45_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR A3 a_346_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_355_74# A2 a_433_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_45_264# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 X a_45_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_346_368# B1 a_45_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_45_264# B2 a_346_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_433_74# A1 a_45_264# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_4.cdl b/cells/a32o/sky130_fd_sc_ls__a32o_4.cdl
index 18c69ef..439a0ae 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_4.cdl
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a32o_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt 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
-MMNA0 y A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 sndA1 A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 sndA2 A3 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 sndB1 B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a32o_4
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_4.netlist.tsv b/cells/a32o/sky130_fd_sc_ls__a32o_4.netlist.tsv
index 81fa722..a62b8e5 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_4.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a32o_4	A1:I A2:I A3: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_4.spice b/cells/a32o/sky130_fd_sc_ls__a32o_4.spice
index 396eac7..5b96b96 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_4.spice
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__a32o_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR a_83_283# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.2278e+12p pd=1.695e+07u as=6.72e+11p ps=5.68e+06u
-M1001 a_509_392# B2 a_83_283# VPB phighvt w=1e+06u l=150000u
-+  ad=2.105e+12p pd=1.621e+07u as=7e+11p ps=5.4e+06u
-M1002 VPWR A1 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_992_122# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=5.568e+11p pd=5.58e+06u as=1.47252e+12p ps=1.141e+07u
-M1004 a_509_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_509_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_83_283# VGND VNB nshort w=740000u l=150000u
-+  ad=4.255e+11p pd=4.11e+06u as=0p ps=0u
-M1007 X a_83_283# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_992_122# A2 a_1079_122# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.096e+11p ps=3.84e+06u
-M1009 VGND A3 a_992_122# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_83_283# B2 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A3 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_83_283# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_587_110# B1 a_83_283# VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=4.34975e+11p ps=4.13e+06u
-M1014 VPWR A2 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B2 a_587_110# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_83_283# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_83_283# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_509_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_509_392# B1 a_83_283# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_83_283# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1079_122# A2 a_992_122# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_83_283# A1 a_1079_122# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_83_283# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_83_283# B1 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1079_122# A1 a_83_283# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_587_110# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_83_283# B1 a_587_110# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_83_283# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_1079_122# A1 a_83_283# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_1079_122# A2 a_992_122# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_509_392# B2 a_83_283# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_509_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VPWR A3 a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_83_283# A1 a_1079_122# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_509_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND a_83_283# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_83_283# B1 a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_83_283# B1 a_587_110# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR a_83_283# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND B2 a_587_110# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 X a_83_283# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A2 a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VPWR A1 a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 VGND a_83_283# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 X a_83_283# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_509_392# B1 a_83_283# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_992_122# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_587_110# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_992_122# A2 a_1079_122# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_587_110# B1 a_83_283# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 X a_83_283# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 X a_83_283# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_83_283# B2 a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 a_509_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 VGND A3 a_992_122# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.cdl b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.cdl
index b0dbfc6..fb0aed1 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.cdl
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a32oi_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 Y B1 VPB 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
+MMPB1 Y B2 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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
-MMPA2 pndA A3 VPB 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
-MMPB0 Y B1 VPB 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
-MMPB1 Y B2 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
+MMNB1 sndB1 B2 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_ls__a32oi_1
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.netlist.tsv b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.netlist.tsv
index 948c8ee..90dc905 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a32oi_1	A1:I A2:I A3: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	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/a32oi/sky130_fd_sc_ls__a32oi_1.spice b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.spice
index 14088e4..f3276a9 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.spice
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a32oi_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A3 a_469_74# VNB nshort w=740000u l=150000u
-+  ad=4.403e+11p pd=4.15e+06u as=3.108e+11p ps=2.32e+06u
-M1001 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.1816e+12p pd=8.83e+06u as=1.0472e+12p ps=6.35e+06u
-M1002 a_119_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1003 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.92e+11p ps=2.94e+06u
-M1005 a_391_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=6.068e+11p ps=3.12e+06u
-M1006 Y B2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_469_74# A2 a_391_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 a_119_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_391_74# A2 a_469_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_119_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND B2 a_119_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_469_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y A1 a_391_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.cdl b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.cdl
index dba6e4a..3aed678 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.cdl
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a32oi_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 Y B1 VPB 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
+MMPB1 Y B2 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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
-MMPA2 pndA A3 VPB 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
-MMPB0 Y B1 VPB 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
-MMPB1 Y B2 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
+MMNB1 sndB1 B2 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
 .ENDS sky130_fd_sc_ls__a32oi_2
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.netlist.tsv b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.netlist.tsv
index 0d72198..6a73eca 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a32oi_2	A1:I A2:I A3: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.spice b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.spice
index 7346c1e..9fd1170 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.spice
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__a32oi_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.3184e+12p pd=1.758e+07u as=1.6296e+12p ps=9.63e+06u
-M1001 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_771_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=4.995e+11p pd=4.31e+06u as=6.66e+11p ps=6.24e+06u
-M1003 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=6.808e+11p ps=6.28e+06u
-M1004 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A1 a_507_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=6.475e+11p ps=6.19e+06u
-M1006 VGND A3 a_771_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.784e+11p pd=5.87e+06u as=0p ps=0u
-M1008 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_507_74# A2 a_771_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_771_74# A2 a_507_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_507_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND A3 a_771_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_771_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_771_74# A2 a_507_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_507_74# A2 a_771_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_507_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 Y A1 a_507_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.cdl b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.cdl
index ee2cba8..31b862d 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.cdl
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a32oi_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPB0 Y B1 VPB 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
+MMPB1 Y B2 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNB0 Y B1 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
-MMPA2 pndA A3 VPB phighvt 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
-MMPB0 Y B1 VPB phighvt 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
-MMPB1 Y B2 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNB0 Y B1 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
-MMNB1 sndB1 B2 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
+MMNB1 sndB1 B2 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
 .ENDS sky130_fd_sc_ls__a32oi_4
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.netlist.tsv b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.netlist.tsv
index 3abb151..2c14092 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a32oi_4	A1:I A2:I A3: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.spice b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.spice
index 035a2b7..b8eab38 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.spice
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__a32oi_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.1384e+12p pd=3.203e+07u as=1.5064e+12p ps=1.165e+07u
-M1001 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=2.5144e+12p ps=1.793e+07u
-M1002 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_868_74# A2 a_1313_74# VNB nshort w=740000u l=150000u
-+  ad=1.0471e+12p pd=1.023e+07u as=8.288e+11p ps=8.16e+06u
-M1004 VGND A3 a_1313_74# VNB nshort w=740000u l=150000u
-+  ad=1.1433e+12p pd=1.049e+07u as=0p ps=0u
-M1005 a_868_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=8.806e+11p ps=8.3e+06u
-M1006 a_1313_74# A2 a_868_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.0952e+12p pd=1.036e+07u as=0p ps=0u
-M1010 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1313_74# A2 a_868_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_868_74# A2 a_1313_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A3 a_1313_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_868_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A1 a_868_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y B2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1313_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y A1 a_868_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1313_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_868_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y A1 a_868_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_868_74# A2 a_1313_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_868_74# A2 a_1313_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND A3 a_1313_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_1313_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_1313_74# A2 a_868_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 Y A1 a_868_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_868_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_1313_74# A2 a_868_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_1313_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VGND A3 a_1313_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 a_27_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X38 a_27_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_1.cdl b/cells/a41o/sky130_fd_sc_ls__a41o_1.cdl
index a096f03..55f772c 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_1.cdl
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a41o_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 pndA A4 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPA3 pndA A4 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNA3 sndA3 A4 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
+MMNB0 y B1 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNA3 sndA3 A4 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
-MMNB0 y B1 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
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__a41o_1
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_1.netlist.tsv b/cells/a41o/sky130_fd_sc_ls__a41o_1.netlist.tsv
index 943508e..3bffdbe 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_1.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a41o_1	A1:I A2:I A3:I A4: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a41o/sky130_fd_sc_ls__a41o_1.spice b/cells/a41o/sky130_fd_sc_ls__a41o_1.spice
index 12d482e..a59d5ce 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_1.spice
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__a41o_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_543_74# A2 a_449_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=2.368e+11p ps=2.12e+06u
-M1001 a_354_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=9.45e+11p pd=7.89e+06u as=1.1804e+12p ps=8.53e+06u
-M1002 a_354_392# A4 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_449_74# A1 a_83_244# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 VPWR A3 a_354_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_354_392# B1 a_83_244# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1006 VGND a_83_244# X VNB nshort w=740000u l=150000u
-+  ad=5.217e+11p pd=4.37e+06u as=7.104e+11p ps=3.4e+06u
-M1007 a_657_74# A3 a_543_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1008 VPWR a_83_244# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1009 VPWR A1 a_354_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_83_244# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A4 a_657_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_449_74# A2 a_543_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR A2 a_354_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 X a_83_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND B1 a_83_244# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_543_74# A3 a_657_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_83_244# B1 a_354_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 X a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_657_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_83_244# A1 a_449_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_354_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_354_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VPWR A4 a_354_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_2.cdl b/cells/a41o/sky130_fd_sc_ls__a41o_2.cdl
index d7b4114..de6c6c8 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_2.cdl
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a41o_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 pndA A4 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPA3 pndA A4 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNA3 sndA3 A4 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
+MMNB0 y B1 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
-MMPB0 y B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNA3 sndA3 A4 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
-MMNB0 y B1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a41o_2
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_2.netlist.tsv b/cells/a41o/sky130_fd_sc_ls__a41o_2.netlist.tsv
index 267fb89..2a34d95 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_2.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a41o_2	A1:I A2:I A3:I A4: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_2.spice b/cells/a41o/sky130_fd_sc_ls__a41o_2.spice
index e31bce9..94a196c 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_2.spice
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__a41o_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_441_74# B1 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.45e+11p pd=2.69e+06u as=8.95e+11p ps=7.79e+06u
-M1001 X a_441_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=1.7528e+12p ps=1.182e+07u
-M1002 VGND B1 a_441_74# VNB nshort w=740000u l=150000u
-+  ad=1.1063e+12p pd=7.43e+06u as=2.886e+11p ps=2.26e+06u
-M1003 VPWR a_441_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_199_74# A3 a_121_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=1.776e+11p ps=1.96e+06u
-M1005 a_121_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_313_74# A2 a_199_74# VNB nshort w=740000u l=150000u
-+  ad=3.626e+11p pd=2.46e+06u as=0p ps=0u
-M1007 a_441_74# A1 a_313_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A4 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_441_74# VGND VNB nshort w=740000u l=150000u
-+  ad=3.034e+11p pd=2.3e+06u as=0p ps=0u
-M1012 VGND a_441_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A2 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_313_74# A1 a_441_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_441_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR A1 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_441_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A3 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND A4 a_121_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_392# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_121_74# A3 a_199_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 X a_441_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_441_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_199_74# A2 a_313_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_392# B1 a_441_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VGND a_441_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_27_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_4.cdl b/cells/a41o/sky130_fd_sc_ls__a41o_4.cdl
index 3c803da..160bfd0 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_4.cdl
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__a41o_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 pndA A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 pndA A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA3 pndA A4 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 y B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y VPB 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 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
-MMPA3 pndA A4 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNA3 sndA3 A4 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
+MMNB0 y B1 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
-MMPB0 y B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt 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
-MMNA0 y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNA3 sndA3 A4 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
-MMNB0 y B1 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
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__a41o_4
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_4.netlist.tsv b/cells/a41o/sky130_fd_sc_ls__a41o_4.netlist.tsv
index 57ea6e2..744ac63 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_4.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__a41o_4	A1:I A2:I A3:I A4: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_4.spice b/cells/a41o/sky130_fd_sc_ls__a41o_4.spice
index 3d76f9e..231dd42 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_4.spice
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__a41o_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_113_98# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.6382e+12p pd=1.979e+07u as=6.72e+11p ps=5.68e+06u
-M1001 VGND a_113_98# X VNB nshort w=740000u l=150000u
-+  ad=1.5409e+12p pd=1.26e+07u as=4.144e+11p ps=4.08e+06u
-M1002 a_1205_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=0p ps=0u
-M1003 a_1205_74# A3 a_1010_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1004 VPWR A3 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.035e+12p ps=1.607e+07u
-M1005 X a_113_98# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_113_98# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_751_74# A2 a_1010_74# VNB nshort w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=0p ps=0u
-M1008 a_113_98# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1009 a_27_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_392# A4 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_113_98# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_113_98# A1 a_751_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_751_74# A1 a_113_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A4 a_1205_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_113_98# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_392# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B1 a_113_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1010_74# A3 a_1205_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A4 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_113_98# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_392# B1 a_113_98# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.5e+11p ps=2.7e+06u
-M1023 a_113_98# B1 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A2 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_113_98# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1010_74# A2 a_751_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_113_98# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_1205_74# A3 a_1010_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_113_98# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_113_98# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_392# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_1010_74# A2 a_751_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A3 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_27_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_1010_74# A3 a_1205_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR A1 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_113_98# A1 a_751_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_751_74# A2 a_1010_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_1205_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 X a_113_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_27_392# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VGND B1 a_113_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 X a_113_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND a_113_98# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_27_392# B1 a_113_98# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 X a_113_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND a_113_98# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VGND A4 a_1205_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 X a_113_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_113_98# B1 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X24 VPWR A4 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_27_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 VPWR A2 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 a_751_74# A1 a_113_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.cdl b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.cdl
index ed36d29..637a89c 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.cdl
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a41oi_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPA3 pndA A4 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB 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
-MMPA2 pndA A3 VPB 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
-MMPA3 pndA A4 VPB 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
-MMPB0 Y B1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNA3 sndA3 A4 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNA3 sndA3 A4 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
+MMNB0 Y B1 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_ls__a41oi_1
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.netlist.tsv b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.netlist.tsv
index ad8ce10..7d4ed59 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a41oi_1	A1:I A2:I A3:I A4: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a41oi/sky130_fd_sc_ls__a41oi_1.spice b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.spice
index 8627ccd..727ac5e 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.spice
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__a41oi_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_469_74# VNB nshort w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=3.108e+11p ps=2.32e+06u
-M1001 a_116_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0584e+12p pd=8.61e+06u as=1.232e+12p ps=6.68e+06u
-M1002 a_277_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=4.921e+11p ps=2.81e+06u
-M1003 a_355_74# A3 a_277_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1004 VPWR A2 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_116_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A4 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_116_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1008 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_469_74# A2 a_355_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_277_74# A3 a_355_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_116_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR A1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_355_74# A2 a_469_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND A4 a_277_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_469_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y B1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_116_368# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR A3 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.cdl b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.cdl
index f2f622b..580d72c 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.cdl
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a41oi_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPA3 pndA A4 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB 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
-MMPA2 pndA A3 VPB 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
-MMPA3 pndA A4 VPB 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
-MMPB0 Y B1 VPB 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNA3 sndA3 A4 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNA3 sndA3 A4 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
+MMNB0 Y B1 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_ls__a41oi_2
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.netlist.tsv b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.netlist.tsv
index 4d03170..779bd94 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a41oi_2	A1:I A2:I A3:I A4: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a41oi/sky130_fd_sc_ls__a41oi_2.spice b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.spice
index 53f6e2d..1ae0f82 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.spice
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.spice
@@ -16,42 +16,23 @@
 
 
 .subckt sky130_fd_sc_ls__a41oi_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_709_74# A3 a_512_74# VNB nshort w=740000u l=150000u
-+  ad=6.438e+11p pd=6.18e+06u as=4.144e+11p ps=4.08e+06u
-M1001 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.8928e+12p pd=1.234e+07u as=2.184e+12p ps=1.734e+07u
-M1002 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_239_74# A2 a_512_74# VNB nshort w=740000u l=150000u
-+  ad=6.808e+11p pd=6.28e+06u as=0p ps=0u
-M1004 Y A1 a_239_74# VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=0p ps=0u
-M1005 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.92e+11p ps=2.94e+06u
-M1007 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=5.069e+11p ps=4.33e+06u
-M1008 a_709_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A4 a_709_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_512_74# A2 a_239_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_512_74# A3 a_709_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A4 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_239_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_368# A4 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR A4 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A4 a_709_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_239_74# A2 a_512_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_709_74# A3 a_512_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_512_74# A2 a_239_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_512_74# A3 a_709_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_239_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y A1 a_239_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_709_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.cdl b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.cdl
index 1061e61..2656a57 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.cdl
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__a41oi_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 pndA A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB 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
+MMPA1 pndA A2 VPB 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
+MMPA2 pndA A3 VPB 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
+MMPA3 pndA A4 VPB 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
+MMPB0 Y B1 VPB 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
+MMNA0 Y A1 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
-MMPA1 pndA A2 VPB phighvt 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
-MMPA2 pndA A3 VPB phighvt 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
-MMPA3 pndA A4 VPB phighvt 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
-MMPB0 Y B1 VPB phighvt 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
-MMNA0 Y A1 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
-MMNA1 sndA1 A2 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
-MMNA2 sndA2 A3 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
-MMNA3 sndA3 A4 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
-MMNB0 Y B1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 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
+MMNA2 sndA2 A3 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
+MMNA3 sndA3 A4 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
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__a41oi_4
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.netlist.tsv b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.netlist.tsv
index 7cf6cd7..e708d95 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__a41oi_4	A1:I A2:I A3:I A4: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.spice b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.spice
index 9cf2c3a..b2ddcd4 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.spice
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ls__a41oi_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.8024e+12p pd=3.143e+07u as=7.224e+11p ps=5.77e+06u
-M1001 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.0968e+12p ps=2.345e+07u
-M1002 a_1235_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=1.0434e+12p pd=1.022e+07u as=8.658e+11p ps=8.26e+06u
-M1003 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_852_74# A2 a_325_74# VNB nshort w=740000u l=150000u
-+  ad=8.806e+11p pd=8.3e+06u as=1.3468e+12p ps=1.104e+07u
-M1005 a_325_74# A2 a_852_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1235_74# A3 a_852_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_368# A2 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A4 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=7.252e+11p ps=6.4e+06u
-M1012 VGND A4 a_1235_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A4 a_1235_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_852_74# A3 a_1235_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A1 a_325_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_852_74# A3 a_1235_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_368# B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_368# A4 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_368# A4 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_325_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_325_74# A2 a_852_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_368# A3 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A1 a_325_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_852_74# A2 a_325_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1235_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A4 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1235_74# A3 a_852_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_325_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR A3 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR A2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A4 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_368# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_1235_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_368# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_1235_74# A3 a_852_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_325_74# A2 a_852_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_852_74# A2 a_325_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 Y A1 a_325_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_852_74# A3 a_1235_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_1235_74# A3 a_852_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_325_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 Y B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 Y A1 a_325_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_852_74# A3 a_1235_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VGND A4 a_1235_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VPWR A2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VPWR A4 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_27_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VPWR A1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_27_368# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_325_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 a_325_74# A2 a_852_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 a_27_368# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 a_1235_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VGND A4 a_1235_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 a_27_368# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 a_852_74# A2 a_325_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 VPWR A3 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_ls__and2_1.cdl b/cells/and2/sky130_fd_sc_ls__and2_1.cdl
index bb741c2..22adb3f 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_1.cdl
+++ b/cells/and2/sky130_fd_sc_ls__and2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB 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
-MMP1 y B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB 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
-MMIP0 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y 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_ls__and2_1
diff --git a/cells/and2/sky130_fd_sc_ls__and2_1.netlist.tsv b/cells/and2/sky130_fd_sc_ls__and2_1.netlist.tsv
index 55d5cee..335543c 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_1.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_ls__and2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and2/sky130_fd_sc_ls__and2_1.spice b/cells/and2/sky130_fd_sc_ls__and2_1.spice
index 6dd924a..19da2fa 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_1.spice
+++ b/cells/and2/sky130_fd_sc_ls__and2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__and2_1 A B VGND VNB VPB VPWR X
-M1000 VPWR B a_56_136# VPB phighvt w=840000u l=150000u
-+  ad=6.496e+11p pd=5.29e+06u as=2.94e+11p ps=2.38e+06u
-M1001 VGND B a_143_136# VNB nshort w=640000u l=150000u
-+  ad=3.107e+11p pd=2.34e+06u as=2.752e+11p ps=2.28e+06u
-M1002 a_143_136# A a_56_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1003 X a_56_136# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1004 a_56_136# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_56_136# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 a_56_136# A a_143_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_56_136# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 VGND a_56_136# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_143_136# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR a_56_136# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A a_56_136# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_ls__and2_2.cdl b/cells/and2/sky130_fd_sc_ls__and2_2.cdl
index 859f0d9..66f8ce7 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_2.cdl
+++ b/cells/and2/sky130_fd_sc_ls__and2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__and2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
+MMN0 y 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
+MMN1 sndA B 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
+MMIN0 X y 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
 .ENDS sky130_fd_sc_ls__and2_2
diff --git a/cells/and2/sky130_fd_sc_ls__and2_2.netlist.tsv b/cells/and2/sky130_fd_sc_ls__and2_2.netlist.tsv
index 8e3569b..7468d57 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_2.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_ls__and2_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__and2_2	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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_ls__and2_2.spice b/cells/and2/sky130_fd_sc_ls__and2_2.spice
index 6783aa0..dfdf543 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_2.spice
+++ b/cells/and2/sky130_fd_sc_ls__and2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__and2_2 A B VGND VNB VPB VPWR X
-M1000 VPWR a_31_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.96e+11p pd=8.34e+06u as=3.36e+11p ps=2.84e+06u
-M1001 VGND B a_118_74# VNB nshort w=740000u l=150000u
-+  ad=5.217e+11p pd=4.37e+06u as=1.776e+11p ps=1.96e+06u
-M1002 X a_31_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 a_118_74# A a_31_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1004 X a_31_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_31_74# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1006 VPWR B a_31_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_31_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_31_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 X a_31_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR A a_31_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_118_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_31_74# A a_118_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND a_31_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_31_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_31_74# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_ls__and2_4.cdl b/cells/and2/sky130_fd_sc_ls__and2_4.cdl
index bb586a5..e44022c 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_4.cdl
+++ b/cells/and2/sky130_fd_sc_ls__and2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__and2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 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
-MMP1 y B VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 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
-MMIP0 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
-MMN0 y A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y 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
 .ENDS sky130_fd_sc_ls__and2_4
diff --git a/cells/and2/sky130_fd_sc_ls__and2_4.netlist.tsv b/cells/and2/sky130_fd_sc_ls__and2_4.netlist.tsv
index 1af127d..501cd79 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_4.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_ls__and2_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__and2_4	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	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_ls__and2_4.spice b/cells/and2/sky130_fd_sc_ls__and2_4.spice
index 12c8fb5..8a0afab 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_4.spice
+++ b/cells/and2/sky130_fd_sc_ls__and2_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__and2_4 A B VGND VNB VPB VPWR X
-M1000 X a_83_269# VGND VNB nshort w=740000u l=150000u
-+  ad=5.254e+11p pd=4.38e+06u as=8.594e+11p ps=8.14e+06u
-M1001 a_83_269# A a_504_119# VNB nshort w=640000u l=150000u
-+  ad=2.08e+11p pd=1.93e+06u as=3.872e+11p ps=3.77e+06u
-M1002 VGND a_83_269# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_504_119# B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A a_83_269# VPB phighvt w=840000u l=150000u
-+  ad=1.58705e+12p pd=1.328e+07u as=5.25e+11p ps=4.61e+06u
-M1005 VPWR B a_83_269# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_504_119# A a_83_269# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_504_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_83_269# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.944e+11p ps=5.72e+06u
-M1009 a_83_269# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_83_269# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_83_269# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_83_269# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_83_269# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_83_269# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_83_269# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_83_269# A a_504_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 X a_83_269# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_83_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR a_83_269# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_83_269# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR A a_83_269# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 VPWR a_83_269# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND B a_504_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_504_119# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_83_269# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND a_83_269# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR B a_83_269# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 X a_83_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 X a_83_269# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_83_269# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_504_119# A a_83_269# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_1.cdl b/cells/and2b/sky130_fd_sc_ls__and2b_1.cdl
index a628e32..c3321d3 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_1.cdl
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__and2b_1 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB 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
-MMP1 y B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 X y VPB 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
-MMIP1 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y 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_ls__and2b_1
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_1.netlist.tsv b/cells/and2b/sky130_fd_sc_ls__and2b_1.netlist.tsv
index 3bce307..2d0834d 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_1.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__and2b_1	A_N: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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	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/and2b/sky130_fd_sc_ls__and2b_1.spice b/cells/and2b/sky130_fd_sc_ls__and2b_1.spice
index 03f8530..89396ef 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_1.spice
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__and2b_1 A_N B VGND VNB VPB VPWR X
-M1000 a_353_98# a_27_74# a_266_98# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1001 VGND B a_353_98# VNB nshort w=640000u l=150000u
-+  ad=6.2665e+11p pd=4.56e+06u as=0p ps=0u
-M1002 X a_266_98# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 VPWR A_N a_27_74# VPB phighvt w=840000u l=150000u
-+  ad=7.14e+11p pd=5.39e+06u as=8.526e+11p ps=3.71e+06u
-M1004 X a_266_98# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1005 a_266_98# a_27_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1006 VGND A_N a_27_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1007 VPWR B a_266_98# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_266_98# a_27_74# a_353_98# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR a_27_74# a_266_98# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_266_98# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_353_98# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 VGND a_266_98# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_266_98# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_2.cdl b/cells/and2b/sky130_fd_sc_ls__and2b_2.cdl
index 8f886f7..ae8529b 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_2.cdl
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__and2b_2 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 X y VPB 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
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMIN1 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y 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
 .ENDS sky130_fd_sc_ls__and2b_2
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_2.netlist.tsv b/cells/and2b/sky130_fd_sc_ls__and2b_2.netlist.tsv
index 23b6401..f7bb946 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_2.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__and2b_2	A_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_2.spice b/cells/and2b/sky130_fd_sc_ls__and2b_2.spice
index cbe125a..c455530 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_2.spice
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__and2b_2 A_N B VGND VNB VPB VPWR X
-M1000 a_505_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=8.742e+11p ps=5.41e+06u
-M1001 a_198_48# a_27_74# a_505_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1002 VPWR a_27_74# a_198_48# VPB phighvt w=1e+06u l=150000u
-+  ad=1.53365e+12p pd=9.39e+06u as=3e+11p ps=2.6e+06u
-M1003 VGND a_198_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 X a_198_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1005 VPWR A_N a_27_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1006 VPWR a_198_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A_N a_27_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1008 X a_198_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_198_48# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_198_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR B a_198_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_505_74# a_27_74# a_198_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND a_198_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 X a_198_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_198_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND B a_505_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_198_48# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_4.cdl b/cells/and2b/sky130_fd_sc_ls__and2b_4.cdl
index 0a9193a..568c444 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_4.cdl
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__and2b_4 A_N B VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 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
-MMP1 y B VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 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
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y 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
 .ENDS sky130_fd_sc_ls__and2b_4
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_4.netlist.tsv b/cells/and2b/sky130_fd_sc_ls__and2b_4.netlist.tsv
index 022d3f2..62cc64f 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_4.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__and2b_4	A_N: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	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_4.spice b/cells/and2b/sky130_fd_sc_ls__and2b_4.spice
index c952a93..74d57d6 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_4.spice
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__and2b_4 A_N B VGND VNB VPB VPWR X
-M1000 VGND a_218_424# X VNB nshort w=740000u l=150000u
-+  ad=9.074e+11p pd=8.29e+06u as=4.218e+11p ps=4.1e+06u
-M1001 VPWR a_218_424# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.7066e+12p pd=1.379e+07u as=6.72e+11p ps=5.68e+06u
-M1002 a_218_424# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.04e+11p pd=4.56e+06u as=0p ps=0u
-M1003 a_218_424# a_27_392# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_218_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_218_424# a_27_392# a_233_74# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=4.16e+11p ps=3.86e+06u
-M1006 VGND a_218_424# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_233_74# B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B a_218_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A_N a_27_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1010 VPWR a_27_392# a_218_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_218_424# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_218_424# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_218_424# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_233_74# a_27_392# a_218_424# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B a_233_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_218_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A_N a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
+X0 X a_218_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR B a_218_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 VGND a_218_424# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 X a_218_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND B a_233_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_218_424# a_27_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_27_392# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_233_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND a_218_424# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_218_424# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 X a_218_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 X a_218_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_392# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_218_424# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_218_424# a_27_392# a_233_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 VPWR a_218_424# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VPWR a_27_392# a_218_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_233_74# a_27_392# a_218_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_ls__and3_1.cdl b/cells/and3/sky130_fd_sc_ls__and3_1.cdl
index 336473a..cc4f93c 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_1.cdl
+++ b/cells/and3/sky130_fd_sc_ls__and3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB 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
-MMP1 y B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB 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
-MMP2 y C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB 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
-MMIP0 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y 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_ls__and3_1
diff --git a/cells/and3/sky130_fd_sc_ls__and3_1.netlist.tsv b/cells/and3/sky130_fd_sc_ls__and3_1.netlist.tsv
index 5d78487..f1f4cef 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_1.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_ls__and3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and3/sky130_fd_sc_ls__and3_1.spice b/cells/and3/sky130_fd_sc_ls__and3_1.spice
index 8e1f11d..c6a2a5a 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_1.spice
+++ b/cells/and3/sky130_fd_sc_ls__and3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__and3_1 A B C VGND VNB VPB VPWR X
-M1000 VPWR C a_27_398# VPB phighvt w=840000u l=150000u
-+  ad=1.06245e+12p pd=6.16e+06u as=4.998e+11p ps=4.55e+06u
-M1001 a_121_136# A a_27_398# VNB nshort w=640000u l=150000u
-+  ad=2.624e+11p pd=2.1e+06u as=1.824e+11p ps=1.85e+06u
-M1002 a_233_136# B a_121_136# VNB nshort w=640000u l=150000u
-+  ad=2.22e+11p pd=2.09e+06u as=0p ps=0u
-M1003 VGND C a_233_136# VNB nshort w=640000u l=150000u
-+  ad=3.107e+11p pd=2.34e+06u as=0p ps=0u
-M1004 a_27_398# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_398# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1006 VPWR A a_27_398# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_398# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 a_233_136# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR B a_27_398# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 VGND a_27_398# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_27_398# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_398# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_27_398# A a_121_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_121_136# B a_233_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_27_398# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_ls__and3_2.cdl b/cells/and3/sky130_fd_sc_ls__and3_2.cdl
index 580bd9c..1e225af 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_2.cdl
+++ b/cells/and3/sky130_fd_sc_ls__and3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__and3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB 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
-MMP1 y B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB 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
-MMP2 y C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB 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
-MMIP0 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y 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
 .ENDS sky130_fd_sc_ls__and3_2
diff --git a/cells/and3/sky130_fd_sc_ls__and3_2.netlist.tsv b/cells/and3/sky130_fd_sc_ls__and3_2.netlist.tsv
index 99b189a..16db338 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_2.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_ls__and3_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__and3_2	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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_ls__and3_2.spice b/cells/and3/sky130_fd_sc_ls__and3_2.spice
index 2499fd7..f5ae0b9 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_2.spice
+++ b/cells/and3/sky130_fd_sc_ls__and3_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__and3_2 A B C VGND VNB VPB VPWR X
-M1000 VPWR A a_41_384# VPB phighvt w=840000u l=150000u
-+  ad=1.3306e+12p pd=8.87e+06u as=4.998e+11p ps=4.55e+06u
-M1001 X a_41_384# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1002 VPWR C a_41_384# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND C a_247_136# VNB nshort w=640000u l=150000u
-+  ad=6.9565e+11p pd=5.12e+06u as=1.536e+11p ps=1.76e+06u
-M1004 VPWR a_41_384# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_247_136# B a_133_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.12e+06u
-M1006 a_133_136# A a_41_384# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1007 VGND a_41_384# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1008 a_41_384# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_41_384# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_41_384# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VPWR a_41_384# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_247_136# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR B a_41_384# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 a_41_384# A a_133_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 X a_41_384# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_133_136# B a_247_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 X a_41_384# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND a_41_384# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_41_384# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_ls__and3_4.cdl b/cells/and3/sky130_fd_sc_ls__and3_4.cdl
index 15dffc4..3ee6b59 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_4.cdl
+++ b/cells/and3/sky130_fd_sc_ls__and3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__and3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 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
-MMP1 y B VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 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
-MMP2 y C VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=2 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
-MMIP0 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
-MMN0 y A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y 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
 .ENDS sky130_fd_sc_ls__and3_4
diff --git a/cells/and3/sky130_fd_sc_ls__and3_4.netlist.tsv b/cells/and3/sky130_fd_sc_ls__and3_4.netlist.tsv
index e06c6f8..872b93a 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_4.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_ls__and3_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__and3_4	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	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_ls__and3_4.spice b/cells/and3/sky130_fd_sc_ls__and3_4.spice
index ce0e81e..a5c37e7 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_4.spice
+++ b/cells/and3/sky130_fd_sc_ls__and3_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__and3_4 A B C VGND VNB VPB VPWR X
-M1000 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.3268e+12p pd=1.666e+07u as=6.72e+11p ps=5.68e+06u
-M1001 a_686_74# B a_489_74# VNB nshort w=640000u l=150000u
-+  ad=5.76e+11p pd=5.64e+06u as=3.84e+11p ps=3.76e+06u
-M1002 a_489_74# B a_686_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_83_260# C VPWR VPB phighvt w=840000u l=150000u
-+  ad=7.896e+11p pd=6.92e+06u as=0p ps=0u
-M1004 VPWR B a_83_260# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_83_260# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_489_74# C VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=9.013e+11p ps=8.26e+06u
-M1007 a_83_260# A a_686_74# VNB nshort w=640000u l=150000u
-+  ad=2.368e+11p pd=2.02e+06u as=0p ps=0u
-M1008 VPWR A a_83_260# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1010 VPWR C a_83_260# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND C a_489_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_83_260# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_686_74# A a_83_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR B a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_83_260# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 VPWR C a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_489_74# B a_686_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_686_74# A a_83_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_83_260# A a_686_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR A a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 VGND C a_489_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_686_74# B a_489_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_83_260# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_83_260# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_489_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_1.cdl b/cells/and3b/sky130_fd_sc_ls__and3b_1.cdl
index e9c2d17..f0a44c9 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_1.cdl
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__and3b_1 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB 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
-MMP1 y B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB 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
-MMP2 y C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 X y VPB 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
-MMIP1 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y 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_ls__and3b_1
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_1.netlist.tsv b/cells/and3b/sky130_fd_sc_ls__and3b_1.netlist.tsv
index 5776cff..8348317 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_1.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__and3b_1	A_N: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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	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/and3b/sky130_fd_sc_ls__and3b_1.spice b/cells/and3b/sky130_fd_sc_ls__and3b_1.spice
index 4e49b00..f250c08 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_1.spice
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__and3b_1 A_N B C VGND VNB VPB VPWR X
-M1000 X a_266_94# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=1.0458e+12p ps=7.86e+06u
-M1001 VPWR a_114_74# a_266_94# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=5.04e+11p ps=4.56e+06u
-M1002 X a_266_94# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=5.5385e+11p ps=4.28e+06u
-M1003 a_353_94# a_114_74# a_266_94# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1004 a_431_94# B a_353_94# VNB nshort w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1005 a_266_94# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_114_74# A_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.856e+11p pd=2.36e+06u as=0p ps=0u
-M1007 VPWR C a_266_94# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_114_74# A_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.9525e+11p pd=1.81e+06u as=0p ps=0u
-M1009 VGND C a_431_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_431_94# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_266_94# a_114_74# a_353_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR B a_266_94# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_266_94# a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VGND a_266_94# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_266_94# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_353_94# B a_431_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR A_N a_114_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_266_94# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 VGND A_N a_114_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_2.cdl b/cells/and3b/sky130_fd_sc_ls__and3b_2.cdl
index ddae272..d48109c 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_2.cdl
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__and3b_2 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 X y VPB 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
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMIN1 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
+MMN2 sndB C 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
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y 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
 .ENDS sky130_fd_sc_ls__and3b_2
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_2.netlist.tsv b/cells/and3b/sky130_fd_sc_ls__and3b_2.netlist.tsv
index 4c87054..599b813 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_2.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__and3b_2	A_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_2.spice b/cells/and3b/sky130_fd_sc_ls__and3b_2.spice
index 5c771f5..73370b1 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_2.spice
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__and3b_2 A_N B C VGND VNB VPB VPWR X
-M1000 VGND C a_454_74# VNB nshort w=740000u l=150000u
-+  ad=6.8395e+11p pd=6.06e+06u as=3.108e+11p ps=2.32e+06u
-M1001 a_284_368# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.95e+11p pd=5.19e+06u as=1.432e+12p ps=1.098e+07u
-M1002 X a_284_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 VPWR a_27_88# a_284_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C a_284_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_454_74# B a_376_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1006 a_376_74# a_27_88# a_284_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1007 VPWR A_N a_27_88# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1008 VPWR a_284_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=2.87e+06u
-M1009 X a_284_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A_N a_27_88# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1011 VGND a_284_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_284_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_454_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_284_368# a_27_88# a_376_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_284_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_284_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_284_368# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_27_88# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 X a_284_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_88# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_284_368# a_27_88# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 X a_284_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_376_74# B a_454_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_4.cdl b/cells/and3b/sky130_fd_sc_ls__and3b_4.cdl
index ac6c182..58cefa3 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_4.cdl
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__and3b_4 A_N B C VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y 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
 .ENDS sky130_fd_sc_ls__and3b_4
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_4.netlist.tsv b/cells/and3b/sky130_fd_sc_ls__and3b_4.netlist.tsv
index 18614c1..8080068 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_4.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__and3b_4	A_N: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_4.spice b/cells/and3b/sky130_fd_sc_ls__and3b_4.spice
index 38fd8d0..3dab6db 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_4.spice
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__and3b_4 A_N B C VGND VNB VPB VPWR X
-M1000 a_239_98# a_27_74# a_298_368# VNB nshort w=640000u l=150000u
-+  ad=5.44e+11p pd=5.54e+06u as=1.792e+11p ps=1.84e+06u
-M1001 a_298_368# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=9e+11p pd=7.8e+06u as=2.5708e+12p ps=1.76e+07u
-M1002 a_498_98# C VGND VNB nshort w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=1.063e+12p ps=1.005e+07u
-M1003 VGND a_298_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1004 a_298_368# C VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_298_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1006 X a_298_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_298_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B a_298_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C a_298_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_298_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_298_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND C a_498_98# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A_N a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1014 a_239_98# B a_498_98# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_498_98# B a_239_98# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_298_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_298_368# a_27_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_298_368# a_27_74# a_239_98# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A_N a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1020 VPWR a_27_74# a_298_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_298_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_298_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_239_98# a_27_74# a_298_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_498_98# B a_239_98# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VGND C a_498_98# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_298_368# a_27_74# a_239_98# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_498_98# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR a_298_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_298_368# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VPWR a_27_74# a_298_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 VPWR a_298_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR C a_298_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_239_98# B a_498_98# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 X a_298_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND a_298_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_298_368# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 VPWR B a_298_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 X a_298_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_298_368# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 VGND a_298_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 X a_298_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_ls__and4_1.cdl b/cells/and4/sky130_fd_sc_ls__and4_1.cdl
index e784e0e..393e70f 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_1.cdl
+++ b/cells/and4/sky130_fd_sc_ls__and4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__and4_1 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB 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
-MMP1 y B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB 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
-MMP2 y C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB 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
-MMP3 y D VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB 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
-MMIP0 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y 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_ls__and4_1
diff --git a/cells/and4/sky130_fd_sc_ls__and4_1.netlist.tsv b/cells/and4/sky130_fd_sc_ls__and4_1.netlist.tsv
index bae0c83..bafaadd 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_1.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_ls__and4_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__and4_1	A:I B:I C:I D: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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and4/sky130_fd_sc_ls__and4_1.spice b/cells/and4/sky130_fd_sc_ls__and4_1.spice
index dd36d9a..b21f0dd 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_1.spice
+++ b/cells/and4/sky130_fd_sc_ls__and4_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__and4_1 A B C D VGND VNB VPB VPWR X
-M1000 VPWR D a_96_74# VPB phighvt w=840000u l=150000u
-+  ad=1.1998e+12p pd=8.28e+06u as=5.88e+11p ps=4.76e+06u
-M1001 VGND D a_335_74# VNB nshort w=640000u l=150000u
-+  ad=2.554e+11p pd=2.2e+06u as=2.688e+11p ps=2.12e+06u
-M1002 X a_96_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 VPWR B a_96_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_96_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1005 a_96_74# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_335_74# C a_257_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1007 a_179_74# A a_96_74# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.696e+11p ps=1.81e+06u
-M1008 a_257_74# B a_179_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_96_74# C VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_96_74# A a_179_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR a_96_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_257_74# C a_335_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR A a_96_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VGND a_96_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR C a_96_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_96_74# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_335_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_179_74# B a_257_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_96_74# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_ls__and4_2.cdl b/cells/and4/sky130_fd_sc_ls__and4_2.cdl
index a42efb5..57d4872 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_2.cdl
+++ b/cells/and4/sky130_fd_sc_ls__and4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__and4_2 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
+MMN0 y 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
+MMN1 sndA B 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
+MMN2 sndB C 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
+MMN3 sndC D 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
+MMIN0 X y 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
 .ENDS sky130_fd_sc_ls__and4_2
diff --git a/cells/and4/sky130_fd_sc_ls__and4_2.netlist.tsv b/cells/and4/sky130_fd_sc_ls__and4_2.netlist.tsv
index bae9471..8eb16d6 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_2.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_ls__and4_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__and4_2	A:I B:I C:I D: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_ls__and4_2.spice b/cells/and4/sky130_fd_sc_ls__and4_2.spice
index fc070cc..8a5eb4e 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_2.spice
+++ b/cells/and4/sky130_fd_sc_ls__and4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__and4_2 A B C D VGND VNB VPB VPWR X
-M1000 a_221_74# B a_143_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=1.776e+11p ps=1.96e+06u
-M1001 X a_56_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=1.8504e+12p ps=1.202e+07u
-M1002 a_56_74# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1003 VGND a_56_74# X VNB nshort w=740000u l=150000u
-+  ad=5.846e+11p pd=4.54e+06u as=2.072e+11p ps=2.04e+06u
-M1004 VPWR a_56_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_56_74# C VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND D a_335_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=3.108e+11p ps=2.32e+06u
-M1007 a_143_74# A a_56_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1008 VPWR D a_56_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_56_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_335_74# C a_221_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B a_56_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_56_74# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 X a_56_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_56_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_221_74# C a_335_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_56_74# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_56_74# A a_143_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A a_56_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_143_74# B a_221_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR C a_56_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 X a_56_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_335_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND a_56_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_ls__and4_4.cdl b/cells/and4/sky130_fd_sc_ls__and4_4.cdl
index f6dec57..63bf99d 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_4.cdl
+++ b/cells/and4/sky130_fd_sc_ls__and4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__and4_4 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB 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
+MMN0 y A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y 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
 .ENDS sky130_fd_sc_ls__and4_4
diff --git a/cells/and4/sky130_fd_sc_ls__and4_4.netlist.tsv b/cells/and4/sky130_fd_sc_ls__and4_4.netlist.tsv
index 6f3c5f7..70ac080 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_4.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_ls__and4_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__and4_4	A:I B:I C:I D: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_ls__and4_4.spice b/cells/and4/sky130_fd_sc_ls__and4_4.spice
index 4c94a5c..500958c 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_4.spice
+++ b/cells/and4/sky130_fd_sc_ls__and4_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__and4_4 A B C D VGND VNB VPB VPWR X
-M1000 a_116_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=1.265e+12p pd=1.053e+07u as=2.8442e+12p ps=2.019e+07u
-M1001 a_116_392# A a_119_119# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=3.584e+11p ps=3.68e+06u
-M1002 a_119_119# B a_32_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.321e+11p ps=5.54e+06u
-M1003 a_119_119# A a_116_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_116_392# D VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_116_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.28e+11p pd=5.78e+06u as=0p ps=0u
-M1006 a_116_392# C VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_116_392# X VNB nshort w=740000u l=150000u
-+  ad=1.05515e+12p pd=8.94e+06u as=4.366e+11p ps=4.14e+06u
-M1008 VPWR a_116_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_116_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_463_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1013 X a_116_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_116_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_32_119# B a_119_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_116_392# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_463_119# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_463_119# C a_32_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_32_119# C a_463_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_116_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_116_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_116_392# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_116_392# A a_119_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR a_116_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_32_119# C a_463_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR C a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_32_119# B a_119_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VGND a_116_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR A a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 X a_116_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR D a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 X a_116_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 X a_116_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR B a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 VPWR a_116_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_116_392# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_116_392# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 VGND D a_463_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 X a_116_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_119_119# A a_116_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_119_119# B a_32_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_463_119# D VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VGND a_116_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_116_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_463_119# C a_32_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_1.cdl b/cells/and4b/sky130_fd_sc_ls__and4b_1.cdl
index 3177008..207ba44 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_1.cdl
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__and4b_1 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB 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
-MMP1 y B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB 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
-MMP2 y C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB 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
-MMP3 y D VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 X y VPB 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
-MMIP1 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y 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_ls__and4b_1
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_1.netlist.tsv b/cells/and4b/sky130_fd_sc_ls__and4b_1.netlist.tsv
index c5326c9..f5cacae 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_1.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__and4b_1	A_N:I B:I C:I D: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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	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/and4b/sky130_fd_sc_ls__and4b_1.spice b/cells/and4b/sky130_fd_sc_ls__and4b_1.spice
index 4ecd682..62b5d54 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_1.spice
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__and4b_1 A_N B C D VGND VNB VPB VPWR X
-M1000 VGND D a_526_139# VNB nshort w=640000u l=150000u
-+  ad=4.5645e+11p pd=3.97e+06u as=3.418e+11p ps=2.55e+06u
-M1001 a_448_139# B a_353_124# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=2.21125e+11p ps=2.08e+06u
-M1002 a_353_124# a_27_74# a_226_424# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1003 X a_226_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 VPWR B a_226_424# VPB phighvt w=840000u l=150000u
-+  ad=1.6114e+12p pd=9.26e+06u as=6.132e+11p ps=4.82e+06u
-M1005 a_226_424# a_27_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_226_424# C VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A_N a_27_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1008 X a_226_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1009 VPWR D a_226_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A_N a_27_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1011 a_526_139# C a_448_139# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_353_124# B a_448_139# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR C a_226_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_226_424# a_27_74# a_353_124# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VGND a_226_424# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_226_424# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 VPWR a_27_74# a_226_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_526_139# D VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_226_424# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VPWR a_226_424# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_448_139# C a_526_139# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_2.cdl b/cells/and4b/sky130_fd_sc_ls__and4b_2.cdl
index b5a108a..cc037a1 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_2.cdl
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__and4b_2 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 X y VPB 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
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMIN1 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
+MMN2 sndB C 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
+MMN3 sndC D 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
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y 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
 .ENDS sky130_fd_sc_ls__and4b_2
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_2.netlist.tsv b/cells/and4b/sky130_fd_sc_ls__and4b_2.netlist.tsv
index 40afeb5..f59e816 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_2.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__and4b_2	A_N:I B:I C:I D: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_2.spice b/cells/and4b/sky130_fd_sc_ls__and4b_2.spice
index 469fc3e..2ab933b 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_2.spice
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__and4b_2 A_N B C D VGND VNB VPB VPWR X
-M1000 a_537_74# C a_459_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=1.776e+11p ps=1.96e+06u
-M1001 a_459_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=7.2205e+11p ps=4.95e+06u
-M1002 a_186_48# D VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.65e+11p pd=5.33e+06u as=1.86225e+12p ps=1.232e+07u
-M1003 VGND a_186_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 a_645_74# B a_537_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1005 VGND A_N a_27_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1006 a_186_48# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_186_48# a_27_112# a_645_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 VPWR A_N a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1009 X a_186_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1010 VPWR C a_186_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_186_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_186_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_27_112# a_186_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_459_74# C a_537_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR B a_186_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_537_74# B a_645_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR D a_186_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_186_48# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND a_186_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_186_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_645_74# a_27_112# a_186_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_186_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_186_48# a_27_112# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_27_112# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 VGND D a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 X a_186_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_27_112# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_4.cdl b/cells/and4b/sky130_fd_sc_ls__and4b_4.cdl
index 4377a6b..5e1f477 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_4.cdl
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__and4b_4 A_N B C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y 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
 .ENDS sky130_fd_sc_ls__and4b_4
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_4.netlist.tsv b/cells/and4b/sky130_fd_sc_ls__and4b_4.netlist.tsv
index 677d060..2a80943 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_4.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__and4b_4	A_N:I B:I C:I D: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_4.spice b/cells/and4b/sky130_fd_sc_ls__and4b_4.spice
index fa5e66d..4e85ecf 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_4.spice
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ls__and4b_4 A_N B C D VGND VNB VPB VPWR X
-M1000 a_664_125# C a_751_125# VNB nshort w=640000u l=150000u
-+  ad=5.37125e+11p pd=5.53e+06u as=3.872e+11p ps=3.77e+06u
-M1001 a_199_294# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=1.76e+12p pd=1.152e+07u as=2.8072e+12p ps=2.011e+07u
-M1002 a_199_294# a_27_368# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_199_294# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=7.952e+11p ps=5.9e+06u
-M1004 VPWR a_199_294# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_664_125# B a_1136_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.992e+11p ps=4.12e+06u
-M1006 a_199_294# D VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_199_294# X VNB nshort w=740000u l=150000u
-+  ad=1.25925e+12p pd=9.57e+06u as=4.144e+11p ps=4.08e+06u
-M1008 X a_199_294# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C a_199_294# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B a_199_294# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_199_294# C VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_751_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_199_294# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A_N a_27_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1015 a_1136_125# a_27_368# a_199_294# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1016 VPWR A_N a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1017 a_751_125# C a_664_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR D a_199_294# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1136_125# B a_664_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_751_125# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_199_294# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_199_294# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_199_294# a_27_368# a_1136_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_27_368# a_199_294# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_199_294# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_199_294# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_199_294# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_1136_125# a_27_368# a_199_294# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR a_199_294# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR C a_199_294# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_664_125# C a_751_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR D a_199_294# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_199_294# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND a_199_294# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_199_294# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_664_125# B a_1136_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_199_294# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 X a_199_294# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 X a_199_294# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR B a_199_294# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VPWR a_199_294# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_199_294# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_27_368# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_751_125# C a_664_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_1136_125# B a_664_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_199_294# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 VGND D a_751_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_27_368# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_751_125# D VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 VPWR a_27_368# a_199_294# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_199_294# a_27_368# a_1136_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.cdl b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.cdl
index d7c63ef..9a366e1 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.cdl
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__and4bb_1 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB 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
-MMP1 y B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB 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
-MMP2 y C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB 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
-MMP3 y D VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 B B_N VPB 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
+MMIP2 X y VPB 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
-MMIP1 B B_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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_ls__and4bb_1
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.netlist.tsv b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.netlist.tsv
index 4570143..6b85185 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__and4bb_1	A_N:I B_N:I C:I D: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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	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/and4bb/sky130_fd_sc_ls__and4bb_1.spice b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.spice
index 318b01f..189ec13 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.spice
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__and4bb_1 A_N B_N C D VGND VNB VPB VPWR X
-M1000 VGND D a_647_74# VNB nshort w=640000u l=150000u
-+  ad=5.299e+11p pd=4.38e+06u as=2.304e+11p ps=2e+06u
-M1001 a_179_48# C VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.46e+11p pd=4.66e+06u as=1.3426e+12p ps=1.028e+07u
-M1002 X a_179_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 a_503_48# B_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1004 a_455_74# a_27_74# a_179_48# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1005 a_533_74# a_503_48# a_455_74# VNB nshort w=640000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=0p ps=0u
-M1006 VPWR D a_179_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_503_48# B_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1008 VPWR A_N a_27_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1009 a_179_48# a_27_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_647_74# C a_533_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_179_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.816e+11p pd=3.1e+06u as=0p ps=0u
-M1012 VGND A_N a_27_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1013 VPWR a_503_48# a_179_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B_N a_503_48# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 VPWR a_179_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_455_74# a_503_48# a_533_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_179_48# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 VGND a_179_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR B_N a_503_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_533_74# C a_647_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_179_48# a_27_74# a_455_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VPWR a_27_74# a_179_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_647_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X12 a_179_48# a_503_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 VPWR C a_179_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.cdl b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.cdl
index 9133143..d5b5200 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.cdl
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__and4bb_2 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 B B_N VPB 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
+MMIP2 X y VPB 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
-MMN3 sndC D VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMIN1 B B_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMIN2 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D 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
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y 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
 .ENDS sky130_fd_sc_ls__and4bb_2
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.netlist.tsv b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.netlist.tsv
index 2e87202..61a0fe0 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__and4bb_2	A_N:I B_N:I C:I D: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.spice b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.spice
index 2e43c58..2d8008e 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.spice
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__and4bb_2 A_N B_N C D VGND VNB VPB VPWR X
-M1000 VPWR A_N a_27_74# VPB phighvt w=840000u l=150000u
-+  ad=1.9728e+12p pd=1.236e+07u as=2.478e+11p ps=2.27e+06u
-M1001 X a_225_82# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=1.0454e+12p ps=7.35e+06u
-M1002 a_312_82# a_27_74# a_225_82# VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.109e+11p ps=2.05e+06u
-M1003 a_390_82# a_354_252# a_312_82# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1004 a_354_252# B_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.604e+11p pd=2.3e+06u as=0p ps=0u
-M1005 a_354_252# B_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1006 a_225_82# C VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=8.7e+11p pd=5.74e+06u as=0p ps=0u
-M1007 X a_225_82# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1008 VGND a_225_82# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_354_252# a_225_82# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_498_82# C a_390_82# VNB nshort w=740000u l=150000u
-+  ad=2.664e+11p pd=2.2e+06u as=0p ps=0u
-M1011 VPWR D a_225_82# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_225_82# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D a_498_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_225_82# a_27_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A_N a_27_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
+X0 X a_225_82# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR C a_225_82# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND B_N a_354_252# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 VGND a_225_82# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 X a_225_82# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_225_82# a_354_252# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_312_82# a_354_252# a_390_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_225_82# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_225_82# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 VPWR B_N a_354_252# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 a_498_82# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR a_27_74# a_225_82# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X14 a_390_82# C a_498_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_225_82# a_27_74# a_312_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.cdl b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.cdl
index e6c7fee..6d8eb74 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.cdl
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__and4bb_4 A_N B_N C D VGND VNB VPB VPWR X
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 y A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP1 y B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP2 y C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMP3 y D VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=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
-MMN3 sndC D VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X y 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
 .ENDS sky130_fd_sc_ls__and4bb_4
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.netlist.tsv b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.netlist.tsv
index 63549c4..16b993c 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__and4bb_4	A_N:I B_N:I C:I D: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.spice b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.spice
index b087ed1..8ac8885 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.spice
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__and4bb_4 A_N B_N C D VGND VNB VPB VPWR X
-M1000 X a_472_388# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=3.7468e+12p ps=2.4e+07u
-M1001 a_472_388# a_200_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=1.4725e+12p pd=1.111e+07u as=0p ps=0u
-M1002 VGND a_472_388# X VNB nshort w=740000u l=150000u
-+  ad=1.1064e+12p pd=1.017e+07u as=4.44e+11p ps=4.16e+06u
-M1003 a_472_388# a_200_74# a_412_140# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=5.888e+11p ps=5.68e+06u
-M1004 VGND D a_882_137# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.888e+11p ps=5.68e+06u
-M1005 X a_472_388# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_472_388# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_74# a_472_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_472_388# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR D a_472_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_472_388# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_472_388# C VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_472_388# a_27_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_472_388# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_200_74# A_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1015 VPWR C a_472_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_472_388# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR B_N a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1018 a_472_388# D VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B_N a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1020 a_200_74# A_N VGND VNB nshort w=640000u l=150000u
-+  ad=1.915e+11p pd=1.99e+06u as=0p ps=0u
-M1021 a_882_137# C a_685_140# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1022 a_882_137# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_412_140# a_200_74# a_472_388# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_200_74# a_472_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_685_140# a_27_74# a_412_140# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_685_140# C a_882_137# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_412_140# a_27_74# a_685_140# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_472_388# a_200_74# a_412_140# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND A_N a_200_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 X a_472_388# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_27_74# a_472_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_685_140# C a_882_137# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_412_140# a_200_74# a_472_388# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_472_388# a_200_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_412_140# a_27_74# a_685_140# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VPWR a_200_74# a_472_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VGND D a_882_137# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VPWR a_472_388# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_882_137# D VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_472_388# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 VPWR a_472_388# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A_N a_200_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VGND a_472_388# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_685_140# a_27_74# a_412_140# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VGND a_472_388# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_27_74# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_27_74# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 X a_472_388# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 X a_472_388# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_472_388# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 X a_472_388# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_882_137# C a_685_140# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_472_388# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 VPWR C a_472_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 VPWR D a_472_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ls__buf_1.cdl b/cells/buf/sky130_fd_sc_ls__buf_1.cdl
index 9ecf789..1fc6bbd 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_1.cdl
+++ b/cells/buf/sky130_fd_sc_ls__buf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab 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
-MMIP1 Ab A VPB 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
-MMIP2 X Ab VPB 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 Ab A VPB 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
+MMIP2 X Ab VPB 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
 .ENDS sky130_fd_sc_ls__buf_1
diff --git a/cells/buf/sky130_fd_sc_ls__buf_1.netlist.tsv b/cells/buf/sky130_fd_sc_ls__buf_1.netlist.tsv
index ee74763..c025be8 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_1.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ls__buf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__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	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ls__buf_1.spice b/cells/buf/sky130_fd_sc_ls__buf_1.spice
index 10808d8..6f4d61a 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_1.spice
+++ b/cells/buf/sky130_fd_sc_ls__buf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ls__buf_1 A VGND VNB VPB VPWR X
-M1000 VPWR A a_27_164# VPB phighvt w=840000u l=150000u
-+  ad=4.102e+11p pd=3.04e+06u as=2.478e+11p ps=2.27e+06u
-M1001 VGND A a_27_164# VNB nshort w=550000u l=150000u
-+  ad=3.0395e+11p pd=2.34e+06u as=2.4915e+11p ps=2.37e+06u
-M1002 X a_27_164# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1003 X a_27_164# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 a_27_164# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 VPWR a_27_164# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_164# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 VGND a_27_164# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ls__buf_16.cdl b/cells/buf/sky130_fd_sc_ls__buf_16.cdl
index f312652..7a484da 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_16.cdl
+++ b/cells/buf/sky130_fd_sc_ls__buf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=6 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=6 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
-MMIN2 X Ab VNB nshort m=16 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=16 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
-MMIP1 Ab A VPB phighvt m=6 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
-MMIP2 X Ab VPB phighvt m=16 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 Ab A VPB pfet_01v8_hvt m=6 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
+MMIP2 X Ab VPB pfet_01v8_hvt m=16 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
 .ENDS sky130_fd_sc_ls__buf_16
diff --git a/cells/buf/sky130_fd_sc_ls__buf_16.netlist.tsv b/cells/buf/sky130_fd_sc_ls__buf_16.netlist.tsv
index 4e7264f..d81b23d 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_16.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ls__buf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__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	nshort	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	6	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	6	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ls__buf_16.spice b/cells/buf/sky130_fd_sc_ls__buf_16.spice
index 34d8ce5..2c3bfb9 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_16.spice
+++ b/cells/buf/sky130_fd_sc_ls__buf_16.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ls__buf_16 A VGND VNB VPB VPWR X
-M1000 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=1.6576e+12p pd=1.632e+07u as=2.8305e+12p ps=2.541e+07u
-M1001 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.1328e+12p pd=3.426e+07u as=2.688e+12p ps=2.272e+07u
-M1002 VPWR A a_83_260# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.008e+12p ps=8.52e+06u
-M1003 VPWR A a_83_260# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A a_83_260# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=6.734e+11p ps=6.26e+06u
-M1006 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_83_260# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_83_260# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A a_83_260# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A a_83_260# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_83_260# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A a_83_260# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_83_260# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_83_260# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_83_260# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND A a_83_260# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_83_260# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_83_260# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_83_260# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR A a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR A a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VGND A a_83_260# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VGND A a_83_260# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_83_260# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 a_83_260# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X38 a_83_260# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X39 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X40 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X41 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X42 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X43 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ls__buf_2.cdl b/cells/buf/sky130_fd_sc_ls__buf_2.cdl
index 16a04c7..7117e80 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_2.cdl
+++ b/cells/buf/sky130_fd_sc_ls__buf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab 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
-MMIP1 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB 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
+MMIP2 X Ab VPB 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
 .ENDS sky130_fd_sc_ls__buf_2
diff --git a/cells/buf/sky130_fd_sc_ls__buf_2.netlist.tsv b/cells/buf/sky130_fd_sc_ls__buf_2.netlist.tsv
index 6818bc3..f2f25f2 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_2.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ls__buf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__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	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ls__buf_2.spice b/cells/buf/sky130_fd_sc_ls__buf_2.spice
index a806a0d..ce1bdae 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_2.spice
+++ b/cells/buf/sky130_fd_sc_ls__buf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__buf_2 A VGND VNB VPB VPWR X
-M1000 X a_21_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=1.1764e+12p ps=6.6e+06u
-M1001 VGND a_21_260# X VNB nshort w=740000u l=150000u
-+  ad=5.216e+11p pd=4.39e+06u as=2.072e+11p ps=2.04e+06u
-M1002 VPWR a_21_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_21_260# A VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1004 a_21_260# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1005 X a_21_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_21_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_21_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_21_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND A a_21_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR a_21_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A a_21_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ls__buf_4.cdl b/cells/buf/sky130_fd_sc_ls__buf_4.cdl
index 12957d1..0106468 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_4.cdl
+++ b/cells/buf/sky130_fd_sc_ls__buf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab 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
-MMIN2 X Ab VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab 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
-MMIP1 Ab A VPB phighvt m=2 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
-MMIP2 X Ab VPB phighvt 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
+MMIP1 Ab A VPB pfet_01v8_hvt m=2 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
+MMIP2 X Ab VPB 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
 .ENDS sky130_fd_sc_ls__buf_4
diff --git a/cells/buf/sky130_fd_sc_ls__buf_4.netlist.tsv b/cells/buf/sky130_fd_sc_ls__buf_4.netlist.tsv
index 0cd678e..6f4db79 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_4.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ls__buf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ls__buf_4.spice b/cells/buf/sky130_fd_sc_ls__buf_4.spice
index 54aefe9..3adaeae 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_4.spice
+++ b/cells/buf/sky130_fd_sc_ls__buf_4.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_ls__buf_4 A VGND VNB VPB VPWR X
-M1000 VGND a_86_260# X VNB nshort w=740000u l=150000u
-+  ad=1.1063e+12p pd=7.43e+06u as=4.144e+11p ps=4.08e+06u
-M1001 a_86_260# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=1.3202e+12p ps=1.095e+07u
-M1002 VPWR a_86_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1003 X a_86_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_86_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_86_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_86_260# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_86_260# A VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 X a_86_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_86_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_86_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_86_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_86_260# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 X a_86_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_86_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_86_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_86_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A a_86_260# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 X a_86_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 X a_86_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND A a_86_260# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 X a_86_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_ls__buf_8.cdl b/cells/buf/sky130_fd_sc_ls__buf_8.cdl
index 0429406..2653acf 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_8.cdl
+++ b/cells/buf/sky130_fd_sc_ls__buf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=3 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
-MMIN2 X Ab VNB nshort m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=8 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
-MMIP1 Ab A VPB phighvt m=3 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
-MMIP2 X Ab VPB phighvt m=8 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 Ab A VPB pfet_01v8_hvt m=3 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
+MMIP2 X Ab VPB pfet_01v8_hvt m=8 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
 .ENDS sky130_fd_sc_ls__buf_8
diff --git a/cells/buf/sky130_fd_sc_ls__buf_8.netlist.tsv b/cells/buf/sky130_fd_sc_ls__buf_8.netlist.tsv
index 74bcb6a..02cc4a3 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_8.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_ls__buf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__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	nshort	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_ls__buf_8.spice b/cells/buf/sky130_fd_sc_ls__buf_8.spice
index 2654305..4ac5000 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_8.spice
+++ b/cells/buf/sky130_fd_sc_ls__buf_8.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__buf_8 A VGND VNB VPB VPWR X
-M1000 VPWR a_27_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.1616e+12p pd=1.73e+07u as=1.4168e+12p ps=1.149e+07u
-M1001 a_27_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=1.591e+12p ps=1.318e+07u
-M1002 X a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=8.325e+11p pd=8.17e+06u as=0p ps=0u
-M1003 VPWR a_27_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_27_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.664e+11p ps=5.67e+06u
-M1011 a_27_74# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_27_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_27_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_27_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VPWR A a_27_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.cdl b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.cdl
index e664a44..24d0ad4 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.cdl
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__bufbuf_16 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab 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
-MMIN2 Abb Ab VNB nshort m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=3 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
-MMIN3 Abbb Abb VNB nshort m=6 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Abbb Abb VNB nfet_01v8 m=6 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
+MMIN4 X Abbb VNB nfet_01v8 m=16 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
-MMIN4 X Abbb VNB nshort m=16 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
-MMIP4 X Abbb VPB phighvt m=16 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 Ab A VPB 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
-MMIP2 Abb Ab VPB phighvt m=3 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
-MI5 Abbb Abb VPB phighvt m=6 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
+MMIP4 X Abbb VPB pfet_01v8_hvt m=16 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 Ab A VPB 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
+MMIP2 Abb Ab VPB pfet_01v8_hvt m=3 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
+MI5 Abbb Abb VPB pfet_01v8_hvt m=6 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
 .ENDS sky130_fd_sc_ls__bufbuf_16
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.netlist.tsv b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.netlist.tsv
index 80c2267..48c5fde 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.netlist.tsv
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__bufbuf_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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nshort	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	Abbb	VGND	VNB	nshort	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	Abbb	VPWR	VPB	phighvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	6	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	Abbb	VGND	VNB	nfet_01v8	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	Abbb	VPWR	VPB	pfet_01v8_hvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8_hvt	6	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.spice b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.spice
index a4f8995..e2de1e2 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.spice
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.spice
@@ -16,108 +16,56 @@
 
 
 .subckt sky130_fd_sc_ls__bufbuf_16 A VGND VNB VPB VPWR X
-M1000 a_588_74# a_203_74# VGND VNB nshort w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=3.3855e+12p ps=2.987e+07u
-M1001 a_203_74# a_27_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.664e+11p pd=5.67e+06u as=4.7712e+12p ps=3.988e+07u
-M1002 VGND a_588_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.6576e+12p ps=1.632e+07u
-M1003 X a_588_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.744e+12p pd=2.282e+07u as=0p ps=0u
-M1004 X a_588_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_203_74# a_588_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.008e+12p ps=8.52e+06u
-M1006 VGND a_203_74# a_588_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_588_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_588_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_588_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_588_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_588_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_588_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_588_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_588_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_588_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_588_74# a_203_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_588_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_588_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_588_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_588_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_588_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_588_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_203_74# a_588_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_588_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_27_368# a_203_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.181e+11p ps=4.09e+06u
-M1026 VPWR a_588_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_588_74# a_203_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_203_74# a_588_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_203_74# a_27_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1031 a_203_74# a_27_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_588_74# a_203_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_588_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_588_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X a_588_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_203_74# a_588_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_588_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 X a_588_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 X a_588_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_588_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_588_74# a_203_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND a_588_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_27_368# a_203_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR a_588_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 X a_588_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_588_74# a_203_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR a_588_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VGND a_203_74# a_588_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND A a_27_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1050 a_203_74# a_27_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VPWR a_588_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_588_74# a_203_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_588_74# a_203_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_588_74# a_203_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_203_74# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND a_27_368# a_203_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VGND a_27_368# a_203_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND a_203_74# a_588_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_203_74# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 VPWR a_203_74# a_588_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 VGND a_203_74# a_588_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 VPWR a_203_74# a_588_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 a_588_74# a_203_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VPWR a_203_74# a_588_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 VPWR a_27_368# a_203_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X38 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 a_588_74# a_203_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X40 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X41 VPWR a_27_368# a_203_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X42 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X43 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X44 VGND a_203_74# a_588_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X45 a_27_368# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X46 a_588_74# a_203_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X47 X a_588_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X48 X a_588_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X49 VPWR a_588_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X50 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X51 VGND a_588_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.cdl b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.cdl
index 9b43998..5eb4bf4 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.cdl
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__bufbuf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab 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
-MMIN3 Abbb Abb VNB nshort m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Abbb Abb VNB nfet_01v8 m=3 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
+MMIN4 X Abbb VNB nfet_01v8 m=8 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
-MMIN4 X Abbb VNB nshort m=8 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
-MMIP4 X Abbb VPB phighvt m=8 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 Ab A VPB 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
-MMIP2 Abb Ab VPB 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
-MI5 Abbb Abb VPB phighvt m=3 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
+MMIP4 X Abbb VPB pfet_01v8_hvt m=8 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 Ab A VPB 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
+MMIP2 Abb Ab VPB 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
+MI5 Abbb Abb VPB pfet_01v8_hvt m=3 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
 .ENDS sky130_fd_sc_ls__bufbuf_8
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.netlist.tsv b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.netlist.tsv
index ad93cfa..778f753 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.netlist.tsv
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__bufbuf_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	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nshort	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	Abbb	VGND	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	Abbb	VPWR	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	Abbb	VGND	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	Abbb	VPWR	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8_hvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.spice b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.spice
index 65e7f6c..3d73b79 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.spice
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ls__bufbuf_8 A VGND VNB VPB VPWR X
-M1000 a_221_368# a_27_112# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=2.4444e+12p ps=2.01e+07u
-M1001 X a_334_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4e+12p pd=1.146e+07u as=0p ps=0u
-M1002 X a_334_368# VGND VNB nshort w=740000u l=150000u
-+  ad=8.732e+11p pd=8.28e+06u as=1.7549e+12p ps=1.515e+07u
-M1003 VPWR a_334_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_334_368# a_221_368# VGND VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=0p ps=0u
-M1005 VGND a_334_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_334_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_221_368# a_334_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.664e+11p ps=5.67e+06u
-M1008 VPWR a_334_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_334_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_334_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_334_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_221_368# a_27_112# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 VGND a_221_368# a_334_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_334_368# a_221_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_27_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1016 VPWR a_334_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_334_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1019 X a_334_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_221_368# a_334_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_334_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_221_368# a_334_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_334_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_334_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_334_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_334_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_334_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR a_27_112# a_221_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR a_221_368# a_334_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR a_334_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND a_27_112# a_221_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND a_334_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND a_334_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 X a_334_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_27_112# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VPWR a_334_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 X a_334_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND a_334_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND a_334_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 X a_334_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_334_368# a_221_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 X a_334_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_334_368# a_221_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 X a_334_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR a_334_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_334_368# a_221_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 X a_334_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VGND a_221_368# a_334_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_27_112# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X24 a_334_368# a_221_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 X a_334_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.cdl b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.cdl
index 83bc548..dd05381 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.cdl
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__bufinv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Ab A VNB nshort m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=3 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
-MMIN2 Abb Ab VNB nshort m=6 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=6 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
-MMIN3 Y Abb VNB nshort m=16 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Y Abb VNB nfet_01v8 m=16 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
-MMIP1 Ab A VPB phighvt m=3 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
-MMIP2 Abb Ab VPB phighvt m=6 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
-MMIP3 Y Abb VPB phighvt m=16 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 Ab A VPB pfet_01v8_hvt m=3 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
+MMIP2 Abb Ab VPB pfet_01v8_hvt m=6 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
+MMIP3 Y Abb VPB pfet_01v8_hvt m=16 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
 .ENDS sky130_fd_sc_ls__bufinv_16
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.netlist.tsv b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.netlist.tsv
index 3ea7ec9..777c662 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.netlist.tsv
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__bufinv_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
-MMIN1	MOSFET	Ab	A	VGND	VNB	nshort	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Y	Abb	VGND	VNB	nshort	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	6	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	Y	Abb	VPWR	VPB	phighvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	6	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	6	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8_hvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.spice b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.spice
index c0ed426..24ff538 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.spice
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.spice
@@ -16,104 +16,54 @@
 
 
 .subckt sky130_fd_sc_ls__bufinv_16 A VGND VNB VPB VPWR Y
-M1000 VGND a_384_74# Y VNB nshort w=740000u l=150000u
-+  ad=3.2079e+12p pd=2.791e+07u as=1.6576e+12p ps=1.632e+07u
-M1001 Y a_384_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.7328e+12p pd=2.28e+07u as=4.4856e+12p ps=3.713e+07u
-M1002 Y a_384_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_384_74# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=0p ps=0u
-M1004 VPWR a_27_74# a_384_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.0304e+12p ps=8.56e+06u
-M1005 VGND a_384_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_384_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_74# a_384_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_27_74# a_384_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_384_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_384_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_384_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_384_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_384_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_384_74# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_384_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_27_74# a_384_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_384_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_384_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_384_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_384_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.664e+11p ps=5.67e+06u
-M1022 a_27_74# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_384_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y a_384_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.181e+11p ps=4.09e+06u
-M1026 Y a_384_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_27_74# a_384_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_384_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_384_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_384_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y a_384_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_384_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_384_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_27_74# a_384_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y a_384_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_384_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_384_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_384_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 Y a_384_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 Y a_384_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_384_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_384_74# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_384_74# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_384_74# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR a_384_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_384_74# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_27_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND a_27_74# a_384_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_27_74# a_384_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_384_74# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_27_74# a_384_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_384_74# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_384_74# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_384_74# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_384_74# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 VGND a_27_74# a_384_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VPWR a_27_74# a_384_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 a_384_74# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 VGND a_27_74# a_384_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X40 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X41 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X42 VGND a_384_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X43 Y a_384_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X44 VPWR A a_27_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X45 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X46 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X47 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X48 VPWR a_384_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X49 Y a_384_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.cdl b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.cdl
index 79670cf..541ce6c 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.cdl
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__bufinv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Ab A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab 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
-MMIN2 Abb Ab VNB nshort m=3 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=3 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
-MMIN3 Y Abb VNB nshort m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Y Abb VNB nfet_01v8 m=8 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
-MMIP1 Ab A VPB 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
-MMIP2 Abb Ab VPB phighvt m=3 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
-MMIP3 Y Abb VPB phighvt m=8 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 Ab A VPB 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
+MMIP2 Abb Ab VPB pfet_01v8_hvt m=3 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
+MMIP3 Y Abb VPB pfet_01v8_hvt m=8 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
 .ENDS sky130_fd_sc_ls__bufinv_8
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.netlist.tsv b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.netlist.tsv
index b2383ac..9216e1b 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.netlist.tsv
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__bufinv_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
-MMIN1	MOSFET	Ab	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Y	Abb	VGND	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	Y	Abb	VPWR	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	3	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.spice b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.spice
index 53370f5..ebecc46 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.spice
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__bufinv_8 A VGND VNB VPB VPWR Y
-M1000 Y a_183_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4896e+12p pd=1.162e+07u as=2.184e+12p ps=1.734e+07u
-M1001 Y a_183_48# VGND VNB nshort w=740000u l=150000u
-+  ad=8.954e+11p pd=8.34e+06u as=1.5392e+12p ps=1.304e+07u
-M1002 VPWR a_183_48# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_183_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_183_48# a_27_368# VGND VNB nshort w=740000u l=150000u
-+  ad=4.292e+11p pd=4.12e+06u as=0p ps=0u
-M1005 VGND a_183_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_183_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_183_48# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_183_48# a_27_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_183_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_183_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_183_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_368# a_183_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1014 a_183_48# a_27_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.664e+11p pd=5.67e+06u as=0p ps=0u
-M1015 Y a_183_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_183_48# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_183_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_27_368# a_183_48# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_183_48# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_183_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A a_27_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1022 Y a_183_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_183_48# a_27_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_183_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND a_27_368# a_183_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_27_368# a_183_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND a_183_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_183_48# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR a_183_48# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND a_183_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_183_48# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_183_48# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VPWR a_183_48# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR a_27_368# a_183_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR a_183_48# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND a_183_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND a_183_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y a_183_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VGND a_27_368# a_183_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Y a_183_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 Y a_183_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 Y a_183_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 Y a_183_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_27_368# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 Y a_183_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 Y a_183_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.cdl b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.cdl
index 7e8314a..d13a866 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__clkbuf_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB 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 X Ab VPB 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
+MMIP0 Ab A VPB 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
+MMIP1 X Ab VPB 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
 .ENDS sky130_fd_sc_ls__clkbuf_1
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.netlist.tsv
index aa721ca..bce44b9 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__clkbuf_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
-MMIN0	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.spice b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.spice
index a9017db..3c10be8 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.spice
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ls__clkbuf_1 A VGND VNB VPB VPWR X
-M1000 VPWR A a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.48e+11p pd=3.04e+06u as=3.304e+11p ps=2.83e+06u
-M1001 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1002 X a_27_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.19e+11p pd=1.41e+06u as=3.276e+11p ps=2.4e+06u
-M1003 VGND A a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.cdl b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.cdl
index f50df9b..b9593ec 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__clkbuf_16 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nshort m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nshort m=16 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=16 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB phighvt 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
-MMIP1 X Ab VPB phighvt m=16 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
+MMIP0 Ab A VPB 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
+MMIP1 X Ab VPB pfet_01v8_hvt m=16 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
 .ENDS sky130_fd_sc_ls__clkbuf_16
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.netlist.tsv
index c48c234..547e0a0 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__clkbuf_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
-MMIN0	MOSFET	Ab	A	VGND	VNB	nshort	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nshort	16	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	16	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.spice b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.spice
index b4497a9..c88aa4c 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.spice
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__clkbuf_16 A VGND VNB VPB VPWR X
-M1000 X a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.688e+12p pd=2.272e+07u as=3.7184e+12p ps=3.128e+07u
-M1001 VPWR a_114_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_114_74# VGND VNB nshort w=420000u l=150000u
-+  ad=9.408e+11p pd=1.12e+07u as=1.4826e+12p ps=1.63e+07u
-M1004 X a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_114_74# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_114_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_114_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_114_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_114_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_114_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_114_74# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_114_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_114_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_114_74# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_114_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_114_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_114_74# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_114_74# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1021 VPWR A a_114_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A a_114_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1023 VPWR a_114_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_114_74# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_114_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_114_74# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 X a_114_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_114_74# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A a_114_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_114_74# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_114_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_114_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_114_74# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_114_74# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A a_114_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_114_74# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A a_114_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_114_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR A a_114_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_114_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR A a_114_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_114_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 X a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 X a_114_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 VGND A a_114_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_114_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X38 VGND a_114_74# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VPWR a_114_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.cdl b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.cdl
index ae47f1e..6538e9c 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__clkbuf_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB 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 X Ab VPB 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
+MMIP0 Ab A VPB 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
+MMIP1 X Ab VPB 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
 .ENDS sky130_fd_sc_ls__clkbuf_2
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.netlist.tsv
index 1deb3d4..254ccd0 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__clkbuf_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
-MMIN0	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.spice b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.spice
index d065f6d..47ea074 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.spice
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__clkbuf_2 A VGND VNB VPB VPWR X
-M1000 a_43_192# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.528e+11p pd=2.87e+06u as=6.552e+11p ps=5.65e+06u
-M1001 a_43_192# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=2.667e+11p ps=2.95e+06u
-M1002 X a_43_192# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1003 VPWR a_43_192# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_43_192# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1005 VGND a_43_192# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_43_192# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 X a_43_192# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_43_192# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 X a_43_192# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_43_192# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A a_43_192# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.cdl b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.cdl
index fa83321..554ef76 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__clkbuf_4 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nshort m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB 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 X Ab VPB phighvt 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
+MMIP0 Ab A VPB 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
+MMIP1 X Ab VPB 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
 .ENDS sky130_fd_sc_ls__clkbuf_4
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.netlist.tsv
index 536e198..0c18dfe 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__clkbuf_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
-MMIN0	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nshort	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.spice b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.spice
index ab1ea3e..56734da 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.spice
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__clkbuf_4 A VGND VNB VPB VPWR X
-M1000 VPWR a_83_270# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0584e+12p pd=8.61e+06u as=6.72e+11p ps=5.68e+06u
-M1001 VGND a_83_270# X VNB nshort w=420000u l=150000u
-+  ad=3.969e+11p pd=4.41e+06u as=2.52e+11p ps=2.88e+06u
-M1002 a_83_270# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1003 a_83_270# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1004 X a_83_270# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_83_270# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_83_270# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_83_270# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_83_270# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_83_270# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_83_270# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_83_270# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 X a_83_270# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_83_270# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_83_270# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_83_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 X a_83_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND A a_83_270# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A a_83_270# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND a_83_270# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.cdl b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.cdl
index e462003..327fa96 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.cdl
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__clkbuf_8 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN0 Ab A VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X Ab VNB nshort m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB 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
-MMIP1 X Ab VPB phighvt m=8 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
+MMIP0 Ab A VPB 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
+MMIP1 X Ab VPB pfet_01v8_hvt m=8 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
 .ENDS sky130_fd_sc_ls__clkbuf_8
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.netlist.tsv b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.netlist.tsv
index 0674798..2572092 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__clkbuf_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
-MMIN0	MOSFET	Ab	A	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	VGND	VNB	nshort	8	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	8	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.spice b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.spice
index db591d9..ded1c1b 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.spice
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__clkbuf_8 A VGND VNB VPB VPWR X
-M1000 VGND a_125_368# X VNB nshort w=420000u l=150000u
-+  ad=8.757e+11p pd=9.21e+06u as=4.809e+11p ps=5.65e+06u
-M1001 VPWR a_125_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.2232e+12p pd=1.741e+07u as=1.3608e+12p ps=1.139e+07u
-M1002 X a_125_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_125_368# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_125_368# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_125_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_125_368# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_125_368# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_125_368# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1009 VGND A a_125_368# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_125_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_125_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.416e+11p ps=2.85e+06u
-M1012 X a_125_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_125_368# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_125_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_125_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_125_368# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_125_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_125_368# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_125_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_125_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_125_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 X a_125_368# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A a_125_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR a_125_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND A a_125_368# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_125_368# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_125_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 X a_125_368# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_125_368# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_125_368# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_125_368# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_125_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR a_125_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND a_125_368# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 X a_125_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_125_368# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 X a_125_368# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 X a_125_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 X a_125_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.cdl b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.cdl
index 48596eb..70e718d 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.cdl
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__clkdlyinv3sd1_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Y Abb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abb VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abb VPB 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
+MI8 Ab A VPB 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
 .ENDS sky130_fd_sc_ls__clkdlyinv3sd1_1
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.netlist.tsv b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.netlist.tsv
index 30dbd1e..a14e9a3 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.netlist.tsv
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__clkdlyinv3sd1_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
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.spice b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.spice
index 34306b4..d48b5be 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.spice
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__clkdlyinv3sd1_1 A VGND VNB VPB VPWR Y
-M1000 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=4.2e+11p pd=3.68e+06u as=1.113e+11p ps=1.37e+06u
-M1001 VPWR A a_28_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0598e+12p pd=6.47e+06u as=3.136e+11p ps=2.8e+06u
-M1002 a_288_74# a_28_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1003 Y a_288_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1004 a_288_74# a_28_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 Y a_288_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND a_288_74# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_288_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.cdl b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.cdl
index b61bb7e..6b9983c 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.cdl
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__clkdlyinv3sd2_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Y Abb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abb VPB 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
-MI8 Ab A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 Y Abb VPB 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
+MI8 Ab A VPB 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
 .ENDS sky130_fd_sc_ls__clkdlyinv3sd2_1
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.netlist.tsv b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.netlist.tsv
index 5aee6a7..1a0ada9 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.netlist.tsv
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__clkdlyinv3sd2_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
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.spice b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.spice
index 89fc779..86cab7b 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.spice
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__clkdlyinv3sd2_1 A VGND VNB VPB VPWR Y
-M1000 a_288_74# a_28_74# VGND VNB nshort w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=4.074e+11p ps=3.62e+06u
-M1001 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 VPWR A a_28_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.648e+11p pd=6.28e+06u as=3.136e+11p ps=2.8e+06u
-M1003 a_288_74# a_28_74# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1004 Y a_288_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1005 Y a_288_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND a_288_74# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X4 VPWR a_288_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.cdl b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.cdl
index 00d7dfb..f4633dd 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.cdl
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__clkdlyinv3sd3_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Y Abb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB phighvt m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI9 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abb VPB 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
-MI8 Ab A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8_hvt 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
+MMIP2 Y Abb VPB 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
+MI8 Ab A VPB 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
 .ENDS sky130_fd_sc_ls__clkdlyinv3sd3_1
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.netlist.tsv b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.netlist.tsv
index 05eaf77..808e516 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.netlist.tsv
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__clkdlyinv3sd3_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
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.spice b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.spice
index da936bd..eca6490 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.spice
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__clkdlyinv3sd3_1 A VGND VNB VPB VPWR Y
-M1000 a_288_74# a_28_74# VGND VNB nshort w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.73e+11p ps=2.98e+06u
-M1001 a_288_74# a_28_74# VPWR VPB phighvt w=1e+06u l=500000u
-+  ad=2.6e+11p pd=2.52e+06u as=7.148e+11p ps=5.78e+06u
-M1002 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR A a_28_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1004 Y a_288_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1005 Y a_288_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND a_288_74# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X3 VPWR a_288_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
 .ends
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.cdl b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.cdl
index f52ef2e..9bb1d1f 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.cdl
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__clkdlyinv5sd1_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abbbb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Y Abbbb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Abbbb Abbb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abbb Abb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 Abbbb Abbb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 Abbb Abb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abbbb VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abbbb VPB 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
+MI8 Ab A VPB 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
-MI8 Ab A VPB 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
-MI17 Abbbb Abbb VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Abbb Abb VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Abbbb Abbb VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 Abbb Abb VPB pfet_01v8_hvt m=1 w=1 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_ls__clkdlyinv5sd1_1
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.netlist.tsv b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.netlist.tsv
index 7f19ab1..2f20a89 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.netlist.tsv
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__clkdlyinv5sd1_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
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abbb	Abb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.spice b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.spice
index 1abe65e..74bd658 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.spice
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__clkdlyinv5sd1_1 A VGND VNB VPB VPWR Y
-M1000 Y a_682_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=1.8798e+12p ps=1.011e+07u
-M1001 a_549_74# a_288_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=7.623e+11p ps=6.15e+06u
-M1002 Y a_682_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VGND a_549_74# a_682_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.583e+11p ps=2.07e+06u
-M1004 a_549_74# a_288_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 VPWR a_549_74# a_682_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6.1e+11p ps=3.22e+06u
-M1006 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR A a_28_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1008 a_288_74# a_28_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1009 a_288_74# a_28_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_682_74# a_549_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND a_288_74# a_549_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR a_288_74# a_549_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND a_682_74# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_682_74# a_549_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_682_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.cdl b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.cdl
index 4d930d2..8c4d123 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.cdl
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__clkdlyinv5sd2_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abbbb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Y Abbbb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Abbbb Abbb VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI9 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abbb Abb VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MI16 Abbbb Abbb VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 Abbb Abb VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8_hvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abbbb VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abbbb VPB 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
+MI8 Ab A VPB 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
-MI8 Ab A VPB 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
-MI17 Abbbb Abbb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Abbb Abb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Abbbb Abbb VPB pfet_01v8_hvt m=1 w=1 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 Abbb Abb VPB pfet_01v8_hvt m=1 w=1 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__clkdlyinv5sd2_1
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.netlist.tsv b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.netlist.tsv
index 6c32ecb..287bc48 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.netlist.tsv
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__clkdlyinv5sd2_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
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abbb	Abb	VGND	VNB	nshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.spice b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.spice
index 9e6c0e8..ad93377 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.spice
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__clkdlyinv5sd2_1 A VGND VNB VPB VPWR Y
-M1000 a_549_74# a_288_74# VGND VNB nshort w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=7.371e+11p ps=6.03e+06u
-M1001 a_549_74# a_288_74# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.6848e+12p ps=9.72e+06u
-M1002 Y a_682_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1003 VGND a_549_74# a_682_74# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.457e+11p ps=2.01e+06u
-M1004 VPWR a_549_74# a_682_74# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.1e+11p ps=3.02e+06u
-M1005 Y a_682_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_288_74# a_28_74# VGND VNB nshort w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 VPWR A a_28_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1009 a_288_74# a_28_74# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
+X0 a_682_74# a_549_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VGND a_288_74# a_549_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X2 a_682_74# a_549_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X3 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VPWR a_288_74# a_549_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND a_682_74# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X8 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_682_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.cdl b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.cdl
index 58fe911..ae3ce60 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.cdl
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__clkdlyinv5sd3_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Abb Ab VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN1 Abb Ab VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Y Abbbb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Y Abbbb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI16 Abbbb Abbb VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI9 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abbb Abb VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI16 Abbbb Abbb VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 Abbb Abb VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Abb Ab VPB phighvt m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIP1 Abb Ab VPB pfet_01v8_hvt m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 Y Abbbb VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 Y Abbbb VPB 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
+MI8 Ab A VPB 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
-MI8 Ab A VPB 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
-MI17 Abbbb Abbb VPB phighvt m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 Abbb Abb VPB phighvt m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
+MI17 Abbbb Abbb VPB pfet_01v8_hvt m=1 w=1 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 Abbb Abb VPB pfet_01v8_hvt m=1 w=1 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_ls__clkdlyinv5sd3_1
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.netlist.tsv b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.netlist.tsv
index 0939656..7a2b2f2 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.netlist.tsv
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__clkdlyinv5sd3_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
-MMIN1	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abbb	Abb	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	phighvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Y	Abbbb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Abbbb	Abbb	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	Y	Abbbb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Abbbb	Abbb	VPWR	VPB	pfet_01v8_hvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Abbb	Abb	VPWR	VPB	pfet_01v8_hvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.spice b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.spice
index 3228fa6..25a89eb 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.spice
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__clkdlyinv5sd3_1 A VGND VNB VPB VPWR Y
-M1000 Y a_682_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=1.1848e+12p ps=8.72e+06u
-M1001 a_549_74# a_288_74# VPWR VPB phighvt w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1002 a_288_74# a_28_74# VGND VNB nshort w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=4.683e+11p ps=4.75e+06u
-M1003 Y a_682_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 VPWR a_549_74# a_682_74# VPB phighvt w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.6e+11p ps=2.52e+06u
-M1005 a_288_74# a_28_74# VPWR VPB phighvt w=1e+06u l=500000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1006 a_549_74# a_288_74# VGND VNB nshort w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 VGND a_549_74# a_682_74# VNB nshort w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VPWR A a_28_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
+X0 VGND a_288_74# a_549_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X1 a_682_74# a_549_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X2 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND a_682_74# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_288_74# a_549_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X5 a_682_74# a_549_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X6 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X7 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X9 VPWR a_682_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.cdl b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.cdl
index 42e95b0..edf6d00 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.cdl
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__clkinv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=2 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
 .ENDS sky130_fd_sc_ls__clkinv_1
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.netlist.tsv b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.netlist.tsv
index 3bc3a66..e1eb34b 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__clkinv_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
-MMIN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Y	A	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.spice b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.spice
index 2ed28eb..f60d847 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.spice
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_ls__clkinv_1 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=2.2535e+11p pd=2.17e+06u as=1.491e+11p ps=1.55e+06u
-M1001 Y A VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=4.788e+11p ps=4.5e+06u
-M1002 VPWR A Y VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.cdl b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.cdl
index c5d8a45..499feb7 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.cdl
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__clkinv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nshort m=16 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8 m=16 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB phighvt m=24 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
+MMIP0 Y A VPB pfet_01v8_hvt m=24 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
 .ENDS sky130_fd_sc_ls__clkinv_16
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.netlist.tsv b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.netlist.tsv
index da3fcf1..8a3bd94 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__clkinv_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
-MMIN0	MOSFET	Y	A	VGND	VNB	nshort	16	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Y	A	VPWR	VPB	phighvt	24	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	16	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	24	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.spice b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.spice
index fbab24b..f573877 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.spice
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__clkinv_16 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.4688e+12p pd=3.71e+07u as=4.0992e+12p ps=3.42e+07u
-M1001 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=1.83765e+12p pd=1.762e+07u as=9.408e+11p ps=1.12e+07u
-M1003 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.cdl b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.cdl
index 5fc350d..dacacf2 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.cdl
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__clkinv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8 m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB phighvt m=3 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=3 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
 .ENDS sky130_fd_sc_ls__clkinv_2
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.netlist.tsv b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.netlist.tsv
index 8d6df7e..cdef74b 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__clkinv_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
-MMIN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Y	A	VPWR	VPB	phighvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	3	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.spice b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.spice
index 6b5ef5c..f75a0ce 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.spice
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.spice
@@ -16,14 +16,9 @@
 
 
 .subckt sky130_fd_sc_ls__clkinv_2 A VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=2.394e+11p pd=2.82e+06u as=3.276e+11p ps=2.4e+06u
-M1001 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.664e+11p pd=5.67e+06u as=6.664e+11p ps=5.67e+06u
-M1003 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.cdl b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.cdl
index 47d20ac..4f0fcb0 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.cdl
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__clkinv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nshort m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8 m=4 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB phighvt m=6 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=6 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
 .ENDS sky130_fd_sc_ls__clkinv_4
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.netlist.tsv b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.netlist.tsv
index 0e5065a..c5027ea 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__clkinv_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
-MMIN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Y	A	VPWR	VPB	phighvt	6	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	6	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.spice b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.spice
index b35d831..4587815 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.spice
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__clkinv_4 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4448e+12p pd=1.154e+07u as=1.008e+12p ps=8.52e+06u
-M1001 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=4.242e+11p pd=3.7e+06u as=6.216e+11p ps=5.48e+06u
-M1002 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.cdl b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.cdl
index 1e86bf9..7b06ef0 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.cdl
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__clkinv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN0 Y A VNB nshort m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Y A VNB nfet_01v8 m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Y A VPB phighvt m=12 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
+MMIP0 Y A VPB pfet_01v8_hvt m=12 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
 .ENDS sky130_fd_sc_ls__clkinv_8
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.netlist.tsv b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.netlist.tsv
index 0a26317..84f222f 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__clkinv_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
-MMIN0	MOSFET	Y	A	VGND	VNB	nshort	8	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Y	A	VPWR	VPB	phighvt	12	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	8	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	12	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.spice b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.spice
index 3305c6f..9685999 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.spice
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__clkinv_8 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.016e+12p pd=1.704e+07u as=2.6488e+12p ps=2.041e+07u
-M1001 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=1.2264e+12p pd=9.2e+06u as=7.77e+11p ps=7.9e+06u
-M1006 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/conb/sky130_fd_sc_ls__conb_1.spice b/cells/conb/sky130_fd_sc_ls__conb_1.spice
index f249d0a..4ab939e 100644
--- a/cells/conb/sky130_fd_sc_ls__conb_1.spice
+++ b/cells/conb/sky130_fd_sc_ls__conb_1.spice
@@ -16,6 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__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_ls__decap_4.cdl b/cells/decap/sky130_fd_sc_ls__decap_4.cdl
index 614a1f9..a8996bf 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_4.cdl
+++ b/cells/decap/sky130_fd_sc_ls__decap_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__decap_4 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=0.42 l=1.0 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 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
-MI2 VPWR VGND VPB phighvt 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
+MI2 VPWR VGND VPB pfet_01v8_hvt 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_ls__decap_4
diff --git a/cells/decap/sky130_fd_sc_ls__decap_4.netlist.tsv b/cells/decap/sky130_fd_sc_ls__decap_4.netlist.tsv
index 28ebb1e..eb3daaa 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_4.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_ls__decap_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__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	nshort	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8_hvt	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_ls__decap_4.spice b/cells/decap/sky130_fd_sc_ls__decap_4.spice
index b3786cc..f9056df 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_4.spice
+++ b/cells/decap/sky130_fd_sc_ls__decap_4.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__decap_4 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phighvt w=1e+06u l=1e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=420000u l=1e+06u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=1e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=1e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_ls__decap_8.cdl b/cells/decap/sky130_fd_sc_ls__decap_8.cdl
index d8854b1..3b53f2a 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_8.cdl
+++ b/cells/decap/sky130_fd_sc_ls__decap_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__decap_8 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI2 VPWR VGND VPB phighvt 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 nshort m=2 w=0.42 l=1.0 mult=1 sa=0.265 sb=0.265
+MI2 VPWR VGND VPB pfet_01v8_hvt 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_01v8 m=2 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
 .ENDS sky130_fd_sc_ls__decap_8
diff --git a/cells/decap/sky130_fd_sc_ls__decap_8.netlist.tsv b/cells/decap/sky130_fd_sc_ls__decap_8.netlist.tsv
index 051de74..4acb0a7 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_8.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_ls__decap_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__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
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	2	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	VGND	VPWR	VGND	VNB	nshort	2	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8_hvt	2	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	2	0.42	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_ls__decap_8.spice b/cells/decap/sky130_fd_sc_ls__decap_8.spice
index c5da094..b54be0f 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_8.spice
+++ b/cells/decap/sky130_fd_sc_ls__decap_8.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ls__decap_8 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nshort w=420000u l=1e+06u
-+  ad=6.279e+11p pd=5.51e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=420000u l=1e+06u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR VGND VPWR VPB phighvt w=1e+06u l=1e+06u
-+  ad=1.57e+12p pd=9.14e+06u as=0p ps=0u
-M1003 VPWR VGND VPWR VPB phighvt w=1e+06u l=1e+06u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=1e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=1e+06u
+X2 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=1e+06u
+X3 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=1e+06u
 .ends
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.cdl b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.cdl
index c2fd92d..e9f51cf 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.cdl
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__decaphe_18 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI0 VGND VPWR VNB nshort m=1 w=0.775 l=7.85 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 VPWR VGND VPB pshort m=1 w=1.255 l=7.85 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI0 VGND VPWR VNB nfet_01v8 m=1 w=0.775 l=7.85 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 VPWR VGND VPB pfet_01v8 m=1 w=1.255 l=7.85 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__decaphe_18
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.netlist.tsv b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.netlist.tsv
index 198121c..cdfbbda 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.netlist.tsv
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__decaphe_18	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
-MI0	MOSFET	VGND	VPWR	VGND	VNB	nshort	1	0.775	7.85	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	VPWR	VGND	VPWR	VPB	pshort	1	1.255	7.85	1	0.265	0.265	0.28	normal	0.063	1.14
+MI0	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.775	7.85	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8	1	1.255	7.85	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.spice b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.spice
index 0331ae3..bb03f2d 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.spice
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__decaphe_18 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nshort w=775000u l=7.85e+06u
-+  ad=4.03e+11p pd=4.14e+06u as=0p ps=0u
-M1001 VPWR VGND VPWR VPB pshort w=1.255e+06u l=7.85e+06u
-+  ad=6.526e+11p pd=6.06e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=775000u l=7.85e+06u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1.255e+06u l=7.85e+06u
 .ends
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.cdl b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.cdl
index fbef041..949e182 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.cdl
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_sc_ls__decaphe_2 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI2 VPWR VGND VPB pshort m=1 w=1.255 l=0.17 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_01v8 m=1 w=1.255 l=0.17 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__decaphe_2
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.netlist.tsv b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.netlist.tsv
index 94131ff..eb08f61 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.netlist.tsv
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.netlist.tsv
@@ -1,3 +1,3 @@
 sky130_fd_sc_ls__decaphe_2	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
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	pshort	1	1.255	0.17	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8	1	1.255	0.17	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.spice b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.spice
index 9810e5b..67594a1 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.spice
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.spice
@@ -16,6 +16,5 @@
 
 
 .subckt sky130_fd_sc_ls__decaphe_2 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB pshort w=1.255e+06u l=170000u
-+  ad=6.526e+11p pd=6.06e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1.255e+06u l=170000u
 .ends
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.cdl b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.cdl
index 9e68eb9..46fd9dc 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.cdl
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__decaphe_3 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI2 VGND VPWR VNB nshort m=1 w=0.775 l=0.65 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 VPWR VGND VPB pshort m=1 w=1.255 l=0.65 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VGND VPWR VNB nfet_01v8 m=1 w=0.775 l=0.65 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 VPWR VGND VPB pfet_01v8 m=1 w=1.255 l=0.65 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__decaphe_3
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.netlist.tsv b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.netlist.tsv
index 7d751a5..02577f4 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.netlist.tsv
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__decaphe_3	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
-MI2	MOSFET	VGND	VPWR	VGND	VNB	nshort	1	0.775	0.65	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	VPWR	VGND	VPWR	VPB	pshort	1	1.255	0.65	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.775	0.65	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8	1	1.255	0.65	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.spice b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.spice
index c9d3fcb..378f9a5 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.spice
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__decaphe_3 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nshort w=775000u l=650000u
-+  ad=4.03e+11p pd=4.14e+06u as=0p ps=0u
-M1001 VPWR VGND VPWR VPB pshort w=1.255e+06u l=650000u
-+  ad=6.526e+11p pd=6.06e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=775000u l=650000u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1.255e+06u l=650000u
 .ends
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.cdl b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.cdl
index 0ace25e..2cf45a7 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.cdl
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__decaphe_4 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=0.775 l=1.13 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB pshort m=1 w=1.255 l=1.13 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.775 l=1.13 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_01v8 m=1 w=1.255 l=1.13 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__decaphe_4
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.netlist.tsv b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.netlist.tsv
index 05c77df..5002fd5 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.netlist.tsv
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__decaphe_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	nshort	1	0.775	1.13	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	pshort	1	1.255	1.13	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.775	1.13	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8	1	1.255	1.13	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.spice b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.spice
index 8522a78..988316f 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.spice
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__decaphe_4 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nshort w=775000u l=1.13e+06u
-+  ad=4.03e+11p pd=4.14e+06u as=0p ps=0u
-M1001 VPWR VGND VPWR VPB pshort w=1.255e+06u l=1.13e+06u
-+  ad=6.526e+11p pd=6.06e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=775000u l=1.13e+06u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1.255e+06u l=1.13e+06u
 .ends
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.cdl b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.cdl
index 80ea085..cd01f84 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.cdl
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__decaphe_6 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=0.775 l=2.09 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 VPWR VGND VPB pshort m=1 w=1.255 l=2.09 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.775 l=2.09 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 VPWR VGND VPB pfet_01v8 m=1 w=1.255 l=2.09 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__decaphe_6
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.netlist.tsv b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.netlist.tsv
index ab8a230..ca70a52 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.netlist.tsv
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__decaphe_6	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	nshort	1	0.775	2.09	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	VPWR	VGND	VPWR	VPB	pshort	1	1.255	2.09	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.775	2.09	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8	1	1.255	2.09	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.spice b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.spice
index a9f4e64..797cccd 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.spice
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__decaphe_6 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nshort w=775000u l=2.09e+06u
-+  ad=4.03e+11p pd=4.14e+06u as=0p ps=0u
-M1001 VPWR VGND VPWR VPB pshort w=1.255e+06u l=2.09e+06u
-+  ad=6.526e+11p pd=6.06e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=775000u l=2.09e+06u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1.255e+06u l=2.09e+06u
 .ends
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.cdl b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.cdl
index 2bca5fb..8209216 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.cdl
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__decaphe_8 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI3 VGND VPWR VNB nshort m=1 w=0.775 l=3.05 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 VPWR VGND VPB pshort m=1 w=1.255 l=3.05 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 VGND VPWR VNB nfet_01v8 m=1 w=0.775 l=3.05 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 VPWR VGND VPB pfet_01v8 m=1 w=1.255 l=3.05 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__decaphe_8
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.netlist.tsv b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.netlist.tsv
index fdd9ee9..91d08e3 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.netlist.tsv
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__decaphe_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
-MI3	MOSFET	VGND	VPWR	VGND	VNB	nshort	1	0.775	3.05	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	pshort	1	1.255	3.05	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.775	3.05	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8	1	1.255	3.05	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.spice b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.spice
index e8d44b0..8efa72e 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.spice
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__decaphe_8 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nshort w=775000u l=3.05e+06u
-+  ad=4.03e+11p pd=4.14e+06u as=0p ps=0u
-M1001 VPWR VGND VPWR VPB pshort w=1.255e+06u l=3.05e+06u
-+  ad=6.526e+11p pd=6.06e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=775000u l=3.05e+06u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1.255e+06u l=3.05e+06u
 .ends
diff --git a/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.spice b/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.spice
index abba5c3..812679a 100644
--- a/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.spice
+++ b/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.spice
@@ -16,7 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__decaphetap_2 VGND VPB VPWR
-R0 VGND VNB short w=0u l=2.03e+06u
-M1000 VPWR VGND VPWR VPB pshort w=1.255e+06u l=170000u
-+  ad=6.526e+11p pd=6.06e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8 w=1.255e+06u l=170000u
+X1 VGND VNB VNB short w=0u l=2.03e+06u
 .ends
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.cdl b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.cdl
index 60c197d..b7afa83 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.cdl
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ls__dfbbn_1 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK_N:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos 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
-MI659 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net141 SET_B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net141 SET_B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net162 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
-MI677 M1 RESET VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 Q net162 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
-MI649 net125 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 net82 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net82 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
-MI652 net162 net82 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net93 M1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net82 RESET VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI44 clkpos CLK_N 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
-MI3 net82 S0 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
-MI7 net81 SET_B 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
-MI679 M1 SET_B VPB 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
-MI669 S0 clkneg VPB 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
-MI660 Q net162 VPB 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
-MI9 net82 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net218 M1 VPB 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
-MI678 net165 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI649 net125 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net210 net82 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net82 SET_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net221 RESET VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI654 net110 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net194 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI651 Q_N net82 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
-MI47 clkneg clkpos VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI652 net162 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI668 S0 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net93 M1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net82 RESET 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
+MI3 net82 S0 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
-MI663 net162 net82 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI7 net81 SET_B 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
-MI661 Q_N net82 VPB 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
+MI679 M1 SET_B VPB 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
+MI669 S0 clkneg VPB 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
+MI660 Q net162 VPB 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
+MI9 net82 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net218 M1 VPB 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
+MI678 net165 RESET VPB 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
+MI662 net210 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net82 SET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net221 RESET VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net194 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB 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
+MI680 M1 M0 VPB 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
+MI663 net162 net82 VPB 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
+MI661 Q_N net82 VPB 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
 .ENDS sky130_fd_sc_ls__dfbbn_1
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.netlist.tsv b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.netlist.tsv
index 80135b5..8c0abfe 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.netlist.tsv
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__dfbbn_1	CLK_N:I D:I RESET_B: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
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net141	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net141	SET_B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net162	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net141	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net125	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net125	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	net82	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net82	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net162	net82	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net93	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net93	M1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net82	RESET	net81	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net82	S0	net81	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net81	SET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net218	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net162	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net82	S0	net221	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net218	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net165	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net210	net82	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net210	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net82	SET_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net221	RESET	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net194	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net194	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net165	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net162	net82	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net82	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net141	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net141	SET_B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net162	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net141	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net125	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net125	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	net82	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net82	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net162	net82	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net93	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net93	M1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net82	RESET	net81	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net82	S0	net81	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net81	SET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net218	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net162	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net82	S0	net221	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net218	M1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net165	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net210	net82	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net210	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net82	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net221	RESET	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net194	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net194	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net165	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net162	net82	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net82	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.spice b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.spice
index 737afe4..9935120 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.spice
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__dfbbn_1 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_1534_446# a_2412_410# VNB nshort w=420000u l=150000u
-+  ad=1.55002e+12p pd=1.351e+07u as=1.134e+11p ps=1.38e+06u
-M1001 a_595_119# a_27_74# a_523_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR a_1534_446# a_2412_410# VPB phighvt w=840000u l=150000u
-+  ad=2.57262e+12p pd=2.063e+07u as=2.394e+11p ps=2.25e+06u
-M1003 a_1349_114# a_200_74# a_1297_424# VPB phighvt w=840000u l=150000u
-+  ad=2.877e+11p pd=2.46e+06u as=2.016e+11p ps=2.16e+06u
-M1004 a_311_119# a_200_74# a_595_119# VNB nshort w=420000u l=150000u
-+  ad=5.1975e+11p pd=3.99e+06u as=0p ps=0u
-M1005 VPWR RESET_B a_978_357# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1006 Q a_2412_410# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1007 VPWR SET_B a_1534_446# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.75e+11p ps=5.15e+06u
-M1008 VGND RESET_B a_978_357# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1009 Q a_2412_410# VGND VNB nshort w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1010 VPWR a_1534_446# a_1483_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1011 a_523_119# a_474_405# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1483_508# a_27_74# a_1349_114# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D a_311_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1818_76# SET_B VGND VNB nshort w=740000u l=150000u
-+  ad=5.032e+11p pd=4.56e+06u as=0p ps=0u
-M1015 a_537_503# a_474_405# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1016 a_474_405# a_595_119# a_867_119# VNB nshort w=550000u l=150000u
-+  ad=1.925e+11p pd=1.8e+06u as=3.4925e+11p ps=3.47e+06u
-M1017 a_1297_424# a_474_405# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1611_140# a_200_74# a_1349_114# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=6.2825e+11p ps=3.42e+06u
-M1019 a_933_424# a_595_119# a_474_405# VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=4.704e+11p ps=4.48e+06u
-M1020 VPWR a_978_357# a_933_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1254_119# a_474_405# VGND VNB nshort w=550000u l=150000u
-+  ad=1.83125e+11p pd=1.8e+06u as=0p ps=0u
-M1022 VGND SET_B a_867_119# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q_N a_1534_446# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1024 a_1349_114# a_27_74# a_1254_119# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q_N a_1534_446# VGND VNB nshort w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1026 a_867_119# a_978_357# a_474_405# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_474_405# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1534_446# a_1349_114# a_1917_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1029 a_1818_76# a_1349_114# a_1534_446# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1030 VPWR CLK_N a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.192e+11p ps=2.81e+06u
-M1031 a_200_74# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1032 a_1534_446# a_978_357# a_1818_76# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND CLK_N a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1034 a_200_74# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1035 a_595_119# a_200_74# a_537_503# VPB phighvt w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1036 a_311_119# a_27_74# a_595_119# VPB phighvt w=420000u l=150000u
-+  ad=3.4845e+11p pd=3.47e+06u as=0p ps=0u
-M1037 VPWR D a_311_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_1534_446# a_1611_140# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1917_392# a_978_357# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1483_508# a_1534_446# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_474_405# a_523_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1297_424# a_200_74# a_1349_114# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_1349_114# a_27_74# a_1483_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_595_119# a_200_74# a_311_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_978_357# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VGND a_27_74# a_200_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_867_119# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 a_1611_140# a_1534_446# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_867_119# a_595_119# a_474_405# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 a_2412_410# a_1534_446# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 VGND a_2412_410# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_537_503# a_200_74# a_595_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_474_405# a_595_119# a_933_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 VPWR a_978_357# a_1917_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_2412_410# a_1534_446# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_27_74# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_1534_446# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_311_119# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_933_424# a_978_357# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 VGND a_474_405# a_1254_119# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X21 a_1917_392# a_1349_114# a_1534_446# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 a_1349_114# a_200_74# a_1611_140# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR a_474_405# a_1297_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 VPWR SET_B a_474_405# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_1254_119# a_27_74# a_1349_114# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X26 VGND a_1534_446# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_595_119# a_27_74# a_311_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_1534_446# a_1349_114# a_1818_76# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VPWR a_474_405# a_537_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VPWR a_2412_410# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 VPWR a_27_74# a_200_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 a_27_74# CLK_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 a_978_357# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_311_119# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_523_119# a_27_74# a_595_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_1534_446# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 VGND SET_B a_1818_76# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 a_474_405# a_978_357# a_867_119# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X39 a_1818_76# a_978_357# a_1534_446# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.cdl b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.cdl
index a1c7881..c4d6d79 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.cdl
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ls__dfbbn_2 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK_N:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos 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
-MI659 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net141 SET_B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net141 SET_B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net162 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
-MI677 M1 RESET VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 Q net162 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
-MI649 net125 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 net82 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net82 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
-MI652 net162 net82 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net93 M1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net82 RESET VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI44 clkpos CLK_N 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
-MI3 net82 S0 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
-MI7 net81 SET_B 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
-MI679 M1 SET_B VPB 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
-MI669 S0 clkneg VPB 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
-MI660 Q net162 VPB 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
-MI9 net82 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net218 M1 VPB 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
-MI678 net165 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI649 net125 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net210 net82 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net82 SET_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net221 RESET VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI654 net110 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net194 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI651 Q_N net82 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
-MI47 clkneg clkpos VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI652 net162 net82 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI668 S0 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net93 M1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net82 RESET 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
+MI3 net82 S0 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
-MI663 net162 net82 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI7 net81 SET_B 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
-MI661 Q_N net82 VPB 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
+MI679 M1 SET_B VPB 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
+MI669 S0 clkneg VPB 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
+MI660 Q net162 VPB 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
+MI9 net82 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net218 M1 VPB 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
+MI678 net165 RESET VPB 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
+MI662 net210 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net82 SET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net221 RESET VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net194 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB 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
+MI680 M1 M0 VPB 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
+MI663 net162 net82 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net82 VPB 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
 .ENDS sky130_fd_sc_ls__dfbbn_2
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.netlist.tsv b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.netlist.tsv
index c725384..30a3244 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.netlist.tsv
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__dfbbn_2	CLK_N:I D:I RESET_B: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
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net141	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net141	SET_B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net162	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net141	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net125	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net125	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	net82	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net82	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net162	net82	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net93	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net93	M1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net82	RESET	net81	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net82	S0	net81	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net81	SET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net218	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net162	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net82	S0	net221	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net218	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net165	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net210	net82	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net210	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net82	SET_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net221	RESET	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net194	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net194	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net165	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net162	net82	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net82	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net141	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net141	SET_B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net162	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net141	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net125	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net125	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	net82	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net82	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net162	net82	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net93	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net93	M1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net82	RESET	net81	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net82	S0	net81	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net81	SET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net218	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net162	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net82	S0	net221	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net218	M1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net165	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net210	net82	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net210	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net82	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net221	RESET	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net194	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net194	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net165	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net162	net82	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net82	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.spice b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.spice
index 686e1f1..eabe261 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.spice
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ls__dfbbn_2 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1240_125# a_473_405# VGND VNB nshort w=550000u l=150000u
-+  ad=1.90125e+11p pd=1.88e+06u as=2.06398e+12p ps=1.857e+07u
-M1001 a_1640_138# a_200_74# a_1335_112# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=6.1e+11p ps=3.85e+06u
-M1002 a_1312_424# a_473_405# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.268e+11p pd=2.22e+06u as=3.2396e+12p ps=2.627e+07u
-M1003 VGND SET_B a_867_125# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=3.4925e+11p ps=3.47e+06u
-M1004 VPWR a_1555_410# a_1504_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 a_867_125# a_975_322# a_473_405# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.54e+11p ps=1.66e+06u
-M1006 Q a_2516_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1007 Q a_2516_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1008 a_1832_74# a_1335_112# a_1555_410# VNB nshort w=740000u l=150000u
-+  ad=4.979e+11p pd=4.43e+06u as=2.368e+11p ps=2.12e+06u
-M1009 a_1832_74# SET_B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1504_508# a_27_74# a_1335_112# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.877e+11p ps=2.46e+06u
-M1011 a_473_405# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1012 Q_N a_1555_410# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1013 VPWR a_1555_410# a_2516_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1014 a_1555_410# a_1335_112# a_1931_392# VPB phighvt w=1e+06u l=150000u
-+  ad=5.75e+11p pd=5.15e+06u as=2.7e+11p ps=2.54e+06u
-M1015 VGND D a_311_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=5.0085e+11p ps=3.93e+06u
-M1016 VPWR a_2516_368# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_975_322# a_930_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1018 VGND a_1555_410# a_1640_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1555_410# a_975_322# a_1832_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_1555_410# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR RESET_B a_975_322# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1022 VGND RESET_B a_975_322# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1023 a_311_119# a_200_74# a_601_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1024 a_536_503# a_473_405# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1025 VGND a_1555_410# a_2516_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1026 VGND a_2516_368# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_1555_410# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1028 VPWR CLK_N a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.192e+11p ps=2.81e+06u
-M1029 a_200_74# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1030 VPWR SET_B a_1555_410# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_529_119# a_473_405# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1032 VGND CLK_N a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1033 a_200_74# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1034 a_1335_112# a_27_74# a_1240_125# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_473_405# a_601_119# a_867_125# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1931_392# a_975_322# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_601_119# a_27_74# a_529_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q_N a_1555_410# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR D a_311_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.4335e+11p ps=3.45e+06u
-M1040 a_930_424# a_601_119# a_473_405# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1335_112# a_200_74# a_1312_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_601_119# a_200_74# a_536_503# VPB phighvt w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1043 a_311_119# a_27_74# a_601_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_2516_368# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND a_2516_368# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_601_119# a_200_74# a_311_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_867_125# a_601_119# a_473_405# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 a_867_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 VPWR a_975_322# a_1931_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_1555_410# a_1335_112# a_1832_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND a_27_74# a_200_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_473_405# a_601_119# a_930_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_975_322# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Q a_2516_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_536_503# a_200_74# a_601_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VGND a_473_405# a_1240_125# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X13 a_529_119# a_27_74# a_601_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1335_112# a_200_74# a_1640_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1555_410# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 Q_N a_1555_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_74# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_311_119# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_975_322# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_1931_392# a_1335_112# a_1555_410# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 Q a_2516_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_1640_138# a_1555_410# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_930_424# a_975_322# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 VPWR SET_B a_473_405# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_2516_368# a_1555_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 VGND a_1555_410# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 VPWR a_473_405# a_536_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_601_119# a_27_74# a_311_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_1504_508# a_1555_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_1832_74# a_975_322# a_1555_410# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_1240_125# a_27_74# a_1335_112# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X32 VPWR a_27_74# a_200_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 a_1312_424# a_200_74# a_1335_112# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X34 a_1335_112# a_27_74# a_1504_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 a_27_74# CLK_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 VPWR a_473_405# a_1312_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X37 a_2516_368# a_1555_410# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 a_311_119# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_473_405# a_975_322# a_867_125# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X40 VPWR a_1555_410# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X41 Q_N a_1555_410# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X42 VGND SET_B a_1832_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X43 VGND a_473_405# a_529_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.cdl b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.cdl
index 801dc60..147a1ad 100644
--- a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.cdl
+++ b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ls__dfbbp_1 CLK D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg 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
-MI659 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 RESET RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net141 SET_B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net141 SET_B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net162 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
-MI677 M1 RESET VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI649 net118 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 net82 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net162 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
-MI651 Q_N net82 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
-MI652 net162 net82 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net93 M1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net82 RESET VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net82 S0 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
-MI7 net81 SET_B 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
-MI679 M1 SET_B VPB 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
-MI669 S0 clkneg VPB 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
-MI660 Q net162 VPB 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
-MI9 net82 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net218 M1 VPB 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
-MI678 net165 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK 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
-MI662 net210 net82 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 net118 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net82 SET_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net221 RESET VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net194 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI654 net110 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI651 Q_N net82 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
-MI45 clkneg CLK VPB 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
-MI680 M1 M0 VPB 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
-MI663 net162 net82 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI652 net162 net82 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net82 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI668 S0 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net93 M1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net82 RESET 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
+MI3 net82 S0 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
+MI7 net81 SET_B 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
+MI679 M1 SET_B VPB 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
+MI669 S0 clkneg VPB 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
+MI660 Q net162 VPB 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
+MI9 net82 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net218 M1 VPB 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
+MI678 net165 RESET VPB 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
+MI662 net210 net82 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net82 SET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net221 RESET VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net194 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net162 net82 VPB 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
+MI661 Q_N net82 VPB 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
 .ENDS sky130_fd_sc_ls__dfbbp_1
diff --git a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.netlist.tsv b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.netlist.tsv
index 3c3aff3..ecdc2bb 100644
--- a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.netlist.tsv
+++ b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__dfbbp_1	CLK:I D:I RESET_B: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
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net141	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net141	SET_B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net162	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net141	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net118	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net118	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	net82	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net82	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net162	net82	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net93	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net93	M1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net82	RESET	net81	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net82	S0	net81	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net81	SET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net218	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net162	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net82	S0	net221	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net218	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net165	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net210	net82	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net210	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net82	SET_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net221	RESET	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net194	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net194	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net165	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net162	net82	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net82	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net141	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net141	SET_B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net162	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net141	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net118	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net118	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	net82	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net82	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net162	net82	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net93	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net93	M1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net82	RESET	net81	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net82	S0	net81	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net81	SET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net218	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net162	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net82	S0	net221	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net218	M1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net165	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net210	net82	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net210	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net82	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net221	RESET	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net194	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net194	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net165	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net162	net82	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net82	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.spice b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.spice
index 46da92e..5cb4909 100644
--- a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.spice
+++ b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__dfbbp_1 CLK D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_1062_93# a_1814_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.9038e+12p pd=2.241e+07u as=2.65e+11p ps=2.53e+06u
-M1001 a_1017_379# a_520_87# a_671_93# VPB phighvt w=840000u l=150000u
-+  ad=2.268e+11p pd=2.22e+06u as=3.276e+11p ps=2.46e+06u
-M1002 a_1814_392# a_1311_424# a_1474_446# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.65e+11p ps=2.73e+06u
-M1003 Q_N a_1474_446# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.83492e+12p ps=1.558e+07u
-M1004 a_1474_446# SET_B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1311_424# a_27_74# a_1203_379# VPB phighvt w=840000u l=150000u
-+  ad=2.856e+11p pd=2.45e+06u as=3.591e+11p ps=2.91e+06u
-M1006 a_520_87# a_27_74# a_422_125# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.7605e+11p ps=1.9e+06u
-M1007 a_1318_119# a_671_93# VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1008 VGND RESET_B a_1062_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1009 VPWR a_1474_446# a_2320_410# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1010 VPWR a_671_93# a_713_379# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 a_1311_424# a_214_74# a_1318_119# VNB nshort w=550000u l=150000u
-+  ad=2.317e+11p pd=2.33e+06u as=0p ps=0u
-M1012 a_1498_74# a_27_74# a_1311_424# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1013 a_214_74# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_214_74# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1015 VGND a_1474_446# a_2320_410# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1016 VGND a_1474_446# a_1498_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Q_N a_1474_446# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1018 Q a_2320_410# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1019 a_671_93# a_520_87# a_872_119# VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=6.465e+11p ps=4.96e+06u
-M1020 a_1418_508# a_214_74# a_1311_424# VPB phighvt w=420000u l=150000u
-+  ad=1.239e+11p pd=1.43e+06u as=0p ps=0u
-M1021 VPWR a_1062_93# a_1017_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_671_93# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1203_379# a_671_93# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_422_125# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1025 a_606_87# a_214_74# a_520_87# VNB nshort w=420000u l=150000u
-+  ad=1.645e+11p pd=1.81e+06u as=0p ps=0u
-M1026 VPWR RESET_B a_1062_93# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1027 a_1474_446# a_1311_424# a_1708_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=4.884e+11p ps=4.28e+06u
-M1028 a_713_379# a_27_74# a_520_87# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.42e+06u
-M1029 VGND CLK a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1030 a_1708_74# a_1062_93# a_1474_446# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_422_125# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_872_119# a_1062_93# a_671_93# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1708_74# SET_B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_671_93# a_606_87# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_872_119# SET_B VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Q a_2320_410# VGND VNB nshort w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1037 VPWR CLK a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1038 a_520_87# a_214_74# a_422_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_1474_446# a_1418_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_422_125# a_214_74# a_520_87# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_422_125# a_27_74# a_520_87# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR SET_B a_671_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_671_93# a_1062_93# a_872_119# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 a_520_87# a_27_74# a_713_379# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_1318_119# a_214_74# a_1311_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 a_2320_410# a_1474_446# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_671_93# a_1203_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_1708_74# a_1311_424# a_1474_446# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_1474_446# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_872_119# a_520_87# a_671_93# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 VGND a_2320_410# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_520_87# a_214_74# a_606_87# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_1311_424# a_27_74# a_1498_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_1474_446# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_1498_74# a_1474_446# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1062_93# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1311_424# a_214_74# a_1418_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_606_87# a_671_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND SET_B a_1708_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR D a_422_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VPWR SET_B a_1474_446# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_713_379# a_671_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_2320_410# a_1474_446# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 VPWR a_2320_410# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VGND a_671_93# a_1318_119# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X27 VGND SET_B a_872_119# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X28 a_1062_93# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X29 a_1017_379# a_1062_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_1814_392# a_1062_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X31 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 VGND a_27_74# a_214_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 a_1203_379# a_27_74# a_1311_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X34 VGND D a_422_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VPWR a_27_74# a_214_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 a_1418_508# a_1474_446# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 a_1474_446# a_1062_93# a_1708_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 a_671_93# a_520_87# a_1017_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X39 a_1474_446# a_1311_424# a_1814_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.cdl b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.cdl
index 56b1b6d..4959259 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.cdl
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 Q_N s0 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
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net93 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net123 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net116 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net93 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net108 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net172 s0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net172 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
-MI654 net92 net93 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net123 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK 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
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net76 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net116 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net191 net93 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 net108 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net93 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net172 s0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net172 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
+MI654 net92 net93 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net93 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net179 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net76 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net191 net93 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net93 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net93 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net179 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net172 s0 VPB 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
+MI660 Q net172 VPB 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
+MI661 Q_N s0 VPB 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
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net172 s0 VPB 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
-MI660 Q net172 VPB 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
-MI661 Q_N s0 VPB 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
-MI45 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 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_ls__dfrbp_1
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.netlist.tsv b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.netlist.tsv
index a01a890..eaefadf 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.netlist.tsv
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ls__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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net93	s0	net123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net123	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net116	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net108	M1	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net92	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net172	s0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net172	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net92	net93	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net76	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net76	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net191	net93	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net93	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net191	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net93	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net179	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net179	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net172	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net172	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net93	s0	net123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net123	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net116	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net108	M1	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net92	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net172	s0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net172	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net92	net93	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net76	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net76	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net191	net93	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net93	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net191	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net93	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net179	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net179	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net172	s0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net172	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.spice b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.spice
index b9ee1e4..3448c8b 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.spice
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__dfrbp_1 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR CLK a_319_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.9859e+12p pd=1.77e+07u as=2.95e+11p ps=2.59e+06u
-M1001 VGND CLK a_319_392# VNB nshort w=740000u l=150000u
-+  ad=1.43248e+12p pd=1.25e+07u as=2.109e+11p ps=2.05e+06u
-M1002 a_841_401# a_705_463# VGND VNB nshort w=640000u l=150000u
-+  ad=3.222e+11p pd=2.44e+06u as=0p ps=0u
-M1003 VPWR a_1224_74# a_2026_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1004 a_1224_74# a_500_392# a_841_401# VNB nshort w=640000u l=150000u
-+  ad=4.33e+11p pd=3.08e+06u as=0p ps=0u
-M1005 Q a_2026_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 VPWR a_841_401# a_796_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_125_78# D a_38_78# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.436e+11p ps=2.84e+06u
-M1008 VGND a_1224_74# a_2026_424# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1009 Q_N a_1224_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1010 a_832_119# a_500_392# a_705_463# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.47e+11p ps=1.54e+06u
-M1011 Q_N a_1224_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.888e+11p pd=3.47e+06u as=0p ps=0u
-M1012 a_1224_74# a_319_392# a_841_401# VPB phighvt w=1e+06u l=150000u
-+  ad=3.877e+11p pd=3.2e+06u as=3e+11p ps=2.6e+06u
-M1013 a_705_463# a_319_392# a_38_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1482_48# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1015 VGND RESET_B a_910_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1016 VPWR a_1482_48# a_1465_471# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1017 a_841_401# a_705_463# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1465_471# a_500_392# a_1224_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_705_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.457e+11p pd=2.85e+06u as=0p ps=0u
-M1020 VPWR a_1224_74# a_1482_48# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_38_78# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=0p ps=0u
-M1022 VPWR RESET_B a_38_78# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_705_463# a_500_392# a_38_78# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_1482_48# a_1434_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 a_796_463# a_319_392# a_705_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1624_74# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1027 a_1482_48# a_1224_74# a_1624_74# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1028 VGND RESET_B a_125_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_500_392# a_319_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.0885e+11p pd=2.07e+06u as=0p ps=0u
-M1030 a_500_392# a_319_392# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1031 Q a_2026_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1032 a_1434_74# a_319_392# a_1224_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_910_119# a_841_401# a_832_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR RESET_B a_1482_48# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_38_78# a_500_392# a_705_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_705_463# a_500_392# a_832_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_705_463# a_841_401# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_796_463# a_841_401# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_2026_424# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_38_78# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_125_78# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_841_401# a_319_392# a_1224_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_1624_74# a_1224_74# a_1482_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_38_78# D a_125_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_705_463# a_841_401# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VGND a_1224_74# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR a_319_392# a_500_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_319_392# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_1465_471# a_1482_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_1482_48# a_1224_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_910_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_2026_424# a_1224_74# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X19 a_319_392# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 a_705_463# a_319_392# a_796_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VPWR RESET_B a_705_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_1224_74# a_500_392# a_1465_471# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 VPWR a_1224_74# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_1224_74# a_319_392# a_1434_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND RESET_B a_1624_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_2026_424# a_1224_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 VGND a_319_392# a_500_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 a_1434_74# a_1482_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_2026_424# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_832_119# a_841_401# a_910_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_38_78# a_319_392# a_705_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VPWR D a_38_78# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_841_401# a_500_392# a_1224_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.cdl b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.cdl
index fe9fc0e..0ec4944 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.cdl
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ls__dfrbp_2 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 nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 Q_N s0 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 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net93 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net123 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net116 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net93 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net108 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net168 s0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net168 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
-MI654 net92 net93 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net123 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK 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
-MI647 M1 M0 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net76 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net116 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI34 net108 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net196 net93 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net93 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net168 s0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 Q net168 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
+MI654 net92 net93 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net93 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net175 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net76 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos 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
+MI47 clkpos clkneg VPB 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
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net196 net93 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net93 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net93 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net175 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net168 s0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net168 VPB 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
+MI661 Q_N s0 VPB 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
+MI45 clkneg CLK VPB 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
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net168 s0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net168 VPB 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
-MI661 Q_N s0 VPB 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
-MI45 clkneg CLK VPB 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
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 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_ls__dfrbp_2
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.netlist.tsv b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.netlist.tsv
index 0268ef6..f35db98 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.netlist.tsv
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ls__dfrbp_2	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	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net93	s0	net123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net123	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net116	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net108	M1	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net92	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net168	s0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net168	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net92	net93	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net76	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net76	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net196	net93	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net93	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net196	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net93	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net175	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net175	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net168	s0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net168	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net93	s0	net123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net123	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net116	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net108	M1	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net92	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net168	s0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net168	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net92	net93	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net76	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net76	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net196	net93	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net93	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net196	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net93	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net175	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net175	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net168	s0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net168	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.spice b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.spice
index 2f1f82a..c65595c 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.spice
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ls__dfrbp_2 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_2363_352# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.7848e+12p pd=2.697e+07u as=3.36e+11p ps=2.84e+06u
-M1001 a_298_294# a_728_331# a_683_485# VPB phighvt w=420000u l=150000u
-+  ad=2.436e+11p pd=2.84e+06u as=1.008e+11p ps=1.32e+06u
-M1002 a_2363_352# a_1586_149# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.9e+11p pd=2.78e+06u as=0p ps=0u
-M1003 a_728_331# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.1658e+12p ps=1.771e+07u
-M1004 a_298_294# a_728_331# a_70_74# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.632e+11p ps=3.03e+06u
-M1005 VGND a_1800_291# a_1499_149# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1006 VGND a_1586_149# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1007 a_728_331# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1008 a_156_74# D a_70_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 VGND RESET_B a_156_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_70_74# a_818_418# a_298_294# VPB phighvt w=420000u l=150000u
-+  ad=4.053e+11p pd=3.61e+06u as=0p ps=0u
-M1011 a_614_81# a_331_392# a_536_81# VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=3.33e+06u as=1.008e+11p ps=1.32e+06u
-M1012 VGND a_2363_352# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1013 a_1586_149# a_728_331# a_1499_149# VNB nshort w=420000u l=150000u
-+  ad=2.165e+11p pd=2.13e+06u as=0p ps=0u
-M1014 Q_N a_1586_149# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1015 VPWR RESET_B a_70_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_1586_149# a_1800_291# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1017 a_1800_291# a_1586_149# a_1974_74# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1018 VPWR a_1800_291# a_1755_389# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1019 a_1974_74# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_2363_352# a_1586_149# VGND VNB nshort w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1021 a_331_392# a_818_418# a_1586_149# VNB nshort w=740000u l=150000u
-+  ad=5.2345e+11p pd=4.67e+06u as=0p ps=0u
-M1022 a_683_485# a_331_392# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1755_389# a_818_418# a_1586_149# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.763e+11p ps=3.06e+06u
-M1024 a_1800_291# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_536_81# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1586_149# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_70_74# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1586_149# a_728_331# a_331_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.75e+11p ps=5.15e+06u
-M1029 VPWR a_728_331# a_818_418# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1030 VGND a_728_331# a_818_418# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.998e+11p ps=2.02e+06u
-M1031 a_331_392# a_298_294# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR RESET_B a_298_294# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q a_2363_352# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_331_392# a_298_294# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_614_81# a_818_418# a_298_294# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Q_N a_1586_149# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Q a_2363_352# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_156_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_70_74# a_728_331# a_298_294# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_818_418# a_728_331# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_1800_291# a_1586_149# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_298_294# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_818_418# a_728_331# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR a_2363_352# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND a_2363_352# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_1586_149# a_818_418# a_331_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_1586_149# a_2363_352# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 Q a_2363_352# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_1499_149# a_1800_291# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND CLK a_728_331# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR a_1586_149# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND RESET_B a_1974_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1755_389# a_1800_291# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VGND a_1586_149# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_70_74# D a_156_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 Q_N a_1586_149# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR a_331_392# a_683_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_1586_149# a_818_418# a_1755_389# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_1974_74# a_1586_149# a_1800_291# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_298_294# a_818_418# a_70_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 VPWR CLK a_728_331# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VPWR a_1586_149# a_2363_352# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 Q a_2363_352# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VGND a_298_294# a_331_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_70_74# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 VPWR D a_70_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_298_294# a_818_418# a_614_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND RESET_B a_536_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 Q_N a_1586_149# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 VPWR a_298_294# a_331_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X33 a_331_392# a_728_331# a_1586_149# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X34 a_536_81# a_331_392# a_614_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VPWR RESET_B a_1800_291# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 a_1499_149# a_728_331# a_1586_149# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_683_485# a_728_331# a_298_294# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.cdl b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.cdl
index 70fe715..3bc11f4 100644
--- a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.cdl
+++ b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__dfrtn_1 CLK_N D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK_N:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net88 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net118 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net111 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net88 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net103 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net159 s0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net159 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
-MI654 net87 net88 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net118 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI33 net111 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net71 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 net103 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos 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
-MI47 clkneg clkpos VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net187 net88 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net88 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net159 s0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 Q net159 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
+MI654 net87 net88 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK_N 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
+MI647 M1 M0 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
-MI658 net88 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net71 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos 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
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net187 net88 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net88 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net88 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net159 s0 VPB 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
+MI660 Q net159 VPB 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
+MI45 clkpos CLK_N VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net159 s0 VPB 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
-MI660 Q net159 VPB 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
-MI45 clkpos CLK_N VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 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_ls__dfrtn_1
diff --git a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.netlist.tsv b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.netlist.tsv
index 77339ef..a340f7b 100644
--- a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.netlist.tsv
+++ b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__dfrtn_1	CLK_N: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	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net88	s0	net118	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net118	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net111	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net103	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net103	M1	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net159	s0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net159	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net87	net88	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net71	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net187	net88	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net88	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net187	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net88	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net159	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net159	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net88	s0	net118	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net118	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net111	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net103	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net103	M1	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net159	s0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net159	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net87	net88	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net71	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net187	net88	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net88	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net187	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net88	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net159	s0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net159	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.spice b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.spice
index e32383f..e4a4201 100644
--- a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.spice
+++ b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__dfrtn_1 CLK_N D RESET_B VGND VNB VPB VPWR Q
-M1000 VGND a_1598_93# a_1550_119# VNB nshort w=420000u l=150000u
-+  ad=1.4689e+12p pd=1.212e+07u as=1.008e+11p ps=1.32e+06u
-M1001 a_1598_93# a_1266_119# a_1736_119# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1002 a_1266_119# a_507_347# a_841_288# VPB phighvt w=1e+06u l=150000u
-+  ad=4.477e+11p pd=3.4e+06u as=7.8e+11p ps=3.56e+06u
-M1003 VPWR a_1598_93# a_1547_508# VPB phighvt w=420000u l=150000u
-+  ad=1.83395e+12p pd=1.721e+07u as=1.134e+11p ps=1.38e+06u
-M1004 Q a_1934_94# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1005 a_507_347# a_300_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.479e+11p pd=2.15e+06u as=0p ps=0u
-M1006 a_1266_119# a_300_74# a_841_288# VNB nshort w=740000u l=150000u
-+  ad=6.134e+11p pd=4.02e+06u as=2.146e+11p ps=2.06e+06u
-M1007 a_300_74# CLK_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1008 a_841_288# a_714_127# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_714_127# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=0p ps=0u
-M1010 a_1736_119# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_714_127# a_300_74# a_33_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.499e+11p ps=2.87e+06u
-M1012 a_1547_508# a_300_74# a_1266_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_714_127# a_507_347# a_33_74# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=2.31e+11p ps=2.78e+06u
-M1014 VPWR a_1266_119# a_1598_93# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1015 VPWR a_1266_119# a_1934_94# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1016 VGND RESET_B a_922_127# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 a_507_347# a_300_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=4.0345e+11p pd=2.86e+06u as=0p ps=0u
-M1018 a_817_463# a_507_347# a_714_127# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1019 a_1598_93# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_841_288# a_714_127# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_1266_119# a_1934_94# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1022 a_1550_119# a_507_347# a_1266_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_33_74# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR RESET_B a_33_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND RESET_B a_120_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1026 a_922_127# a_841_288# a_850_127# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1027 a_300_74# CLK_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.035e+11p pd=2.03e+06u as=0p ps=0u
-M1028 Q a_1934_94# VGND VNB nshort w=740000u l=150000u
-+  ad=2.146e+11p pd=2.06e+06u as=0p ps=0u
-M1029 a_120_74# D a_33_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_850_127# a_300_74# a_714_127# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_841_288# a_817_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_120_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1550_119# a_1598_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_1934_94# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_33_74# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_714_127# a_507_347# a_817_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_841_288# a_507_347# a_1266_119# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_1598_93# a_1266_119# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR RESET_B a_1598_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_1934_94# a_1266_119# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 VGND a_1934_94# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR a_300_74# a_507_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_33_74# a_507_347# a_714_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_300_74# a_507_347# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_1266_119# a_300_74# a_1547_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_1736_119# a_1266_119# a_1598_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_714_127# a_300_74# a_850_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1547_508# a_1598_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_33_74# a_300_74# a_714_127# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_922_127# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_841_288# a_300_74# a_1266_119# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_1934_94# a_1266_119# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X21 a_817_463# a_841_288# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VGND RESET_B a_1736_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_714_127# a_841_288# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_1266_119# a_507_347# a_1550_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VPWR D a_33_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_33_74# D a_120_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VGND CLK_N a_300_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 VPWR CLK_N a_300_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 a_850_127# a_841_288# a_922_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VPWR RESET_B a_714_127# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 VPWR a_714_127# a_841_288# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.cdl b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.cdl
index f0223fe..a308d60 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.cdl
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net88 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net118 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net111 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net88 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net103 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net159 s0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net159 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
-MI654 net87 net88 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net118 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK 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
-MI647 M1 M0 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net71 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net111 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net187 net88 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 net103 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net88 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net159 s0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net159 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
+MI654 net87 net88 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK 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
+MI647 M1 M0 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
-MI658 net88 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net71 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos 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
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net187 net88 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net88 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net88 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net159 s0 VPB 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
+MI660 Q net159 VPB 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
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net159 s0 VPB 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
-MI660 Q net159 VPB 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
-MI45 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 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_ls__dfrtp_1
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.netlist.tsv b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.netlist.tsv
index 6ebd928..ae09103 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net88	s0	net118	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net118	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net111	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net103	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net103	M1	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net159	s0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net159	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net87	net88	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net71	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net187	net88	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net88	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net187	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net88	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net159	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net159	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net88	s0	net118	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net118	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net111	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net103	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net103	M1	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net159	s0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net159	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net87	net88	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net71	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net187	net88	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net88	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net187	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net88	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net159	s0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net159	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.spice b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.spice
index 07d6efd..cb697a4 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.spice
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__dfrtp_1 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR RESET_B a_30_78# VPB phighvt w=420000u l=150000u
-+  ad=1.91035e+12p pd=1.728e+07u as=2.415e+11p ps=2.83e+06u
-M1001 a_1468_493# a_490_390# a_1266_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.603e+11p ps=3.46e+06u
-M1002 VGND a_1864_409# Q VNB nshort w=740000u l=150000u
-+  ad=1.38578e+12p pd=1.21e+07u as=2.109e+11p ps=2.05e+06u
-M1003 VPWR a_830_359# a_785_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1004 VGND RESET_B a_894_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 a_830_359# a_695_457# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.8125e+11p pd=3.01e+06u as=0p ps=0u
-M1006 VPWR CLK a_306_96# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.1e+11p ps=2.62e+06u
-M1007 VPWR a_1864_409# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.808e+11p ps=2.92e+06u
-M1008 VGND RESET_B a_117_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 a_695_457# a_490_390# a_30_78# VPB phighvt w=420000u l=150000u
-+  ad=2.499e+11p pd=2.87e+06u as=0p ps=0u
-M1010 a_1518_203# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1011 a_490_390# a_306_96# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1012 a_894_138# a_830_359# a_816_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1013 a_1864_409# a_1266_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1014 VGND a_1518_203# a_1476_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1015 a_1266_74# a_306_96# a_830_359# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1476_81# a_306_96# a_1266_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.58e+11p ps=3.28e+06u
-M1017 a_1518_203# a_1266_74# a_1656_81# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1018 a_30_78# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_785_457# a_306_96# a_695_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_117_78# D a_30_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1021 VPWR a_1266_74# a_1518_203# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1266_74# a_490_390# a_830_359# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.921e+11p ps=2.81e+06u
-M1023 a_1864_409# a_1266_74# VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1024 VPWR a_1518_203# a_1468_493# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_490_390# a_306_96# VGND VNB nshort w=740000u l=150000u
-+  ad=2.183e+11p pd=2.07e+06u as=0p ps=0u
-M1026 a_830_359# a_695_457# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_816_138# a_490_390# a_695_457# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1028 a_1656_81# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_695_457# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND CLK a_306_96# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.4e+06u
-M1031 a_695_457# a_306_96# a_30_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_306_96# a_490_390# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR RESET_B a_1518_203# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND a_1266_74# a_1864_409# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 a_306_96# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_830_359# a_490_390# a_1266_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_1266_74# a_1864_409# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_1476_81# a_1518_203# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_30_78# a_306_96# a_695_457# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_695_457# a_306_96# a_785_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND RESET_B a_1656_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1656_81# a_1266_74# a_1518_203# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_695_457# a_490_390# a_816_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 Q a_1864_409# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_306_96# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_1518_203# a_1266_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR a_695_457# a_830_359# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_1266_74# a_306_96# a_1476_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1266_74# a_490_390# a_1468_493# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_816_138# a_830_359# a_894_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR D a_30_78# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_117_78# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1468_493# a_1518_203# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_30_78# a_490_390# a_695_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 VPWR RESET_B a_695_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_785_457# a_830_359# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_30_78# D a_117_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_830_359# a_306_96# a_1266_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 a_30_78# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 VPWR a_306_96# a_490_390# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 a_894_138# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND a_695_457# a_830_359# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 Q a_1864_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.cdl b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.cdl
index 1fee150..43b5bd1 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.cdl
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__dfrtp_2 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net88 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net118 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net111 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net88 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net103 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net159 s0 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
-MI653 Q net159 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
-MI654 net87 net88 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net118 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK 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
-MI647 M1 M0 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net71 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net111 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net187 net88 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 net103 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net88 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net159 s0 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
+MI653 Q net159 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
+MI654 net87 net88 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK 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
+MI647 M1 M0 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
-MI658 net88 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net71 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos 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
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net187 net88 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net88 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net88 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net159 s0 VPB 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
+MI660 Q net159 VPB 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
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net159 s0 VPB 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
-MI660 Q net159 VPB 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
-MI45 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 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_ls__dfrtp_2
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.netlist.tsv b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.netlist.tsv
index e4e31ae..c163719 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__dfrtp_2	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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net88	s0	net118	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net118	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net111	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net103	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net103	M1	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net159	s0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net159	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net87	net88	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net71	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net187	net88	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net88	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net187	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net88	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net159	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net159	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net88	s0	net118	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net118	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net111	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net103	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net103	M1	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net159	s0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net159	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net87	net88	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net71	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net187	net88	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net88	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net187	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net88	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net159	s0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net159	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.spice b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.spice
index 5614d7d..aa2d4a3 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.spice
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__dfrtp_2 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 a_1525_212# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=1.96e+06u as=2.3127e+12p ps=2.018e+07u
-M1001 VGND RESET_B a_901_138# VNB nshort w=420000u l=150000u
-+  ad=1.94642e+12p pd=1.538e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_1478_493# a_495_390# a_1271_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.53925e+11p ps=3.66e+06u
-M1003 a_1271_74# a_495_390# a_839_359# VNB nshort w=740000u l=150000u
-+  ad=4.58e+11p pd=3.28e+06u as=2.405e+11p ps=2.13e+06u
-M1004 a_495_390# a_309_390# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 VGND a_1525_212# a_1481_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_901_138# a_839_359# a_823_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_697_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.73e+11p pd=2.98e+06u as=0p ps=0u
-M1008 a_697_463# a_495_390# a_30_78# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.373e+11p ps=2.81e+06u
-M1009 VGND RESET_B a_117_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 VPWR a_839_359# a_798_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_798_463# a_309_390# a_697_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_495_390# a_309_390# VGND VNB nshort w=740000u l=150000u
-+  ad=2.0885e+11p pd=2.07e+06u as=0p ps=0u
-M1013 a_1271_74# a_309_390# a_839_359# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.68125e+11p ps=2.86e+06u
-M1014 a_823_138# a_495_390# a_697_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1015 VGND CLK a_309_390# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.4e+06u
-M1016 a_697_463# a_309_390# a_30_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1017 a_1663_81# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 a_1525_212# a_1271_74# a_1663_81# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1019 a_1921_409# a_1271_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1020 a_839_359# a_697_463# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Q a_1921_409# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1022 a_30_78# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR RESET_B a_30_78# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1921_409# a_1271_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1025 a_117_78# D a_30_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1525_212# a_1478_493# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR CLK a_309_390# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.57e+06u
-M1028 a_839_359# a_697_463# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Q a_1921_409# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1030 VPWR a_1921_409# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1481_81# a_309_390# a_1271_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_1921_409# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1271_74# a_1525_212# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_309_390# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND RESET_B a_1663_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Q a_1921_409# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_30_78# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND a_1271_74# a_1921_409# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_309_390# a_495_390# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_1525_212# a_1271_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_309_390# a_495_390# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND a_697_463# a_839_359# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_1921_409# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_30_78# a_495_390# a_697_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_309_390# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_839_359# a_309_390# a_1271_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_1271_74# a_495_390# a_1478_493# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_839_359# a_495_390# a_1271_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_30_78# a_309_390# a_697_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_1921_409# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_1478_493# a_1525_212# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_697_463# a_309_390# a_798_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VPWR a_1271_74# a_1921_409# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_1663_81# a_1271_74# a_1525_212# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_697_463# a_495_390# a_823_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR D a_30_78# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_901_138# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 Q a_1921_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_1481_81# a_1525_212# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_117_78# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VPWR RESET_B a_1525_212# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 VPWR a_697_463# a_839_359# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 a_30_78# D a_117_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1271_74# a_309_390# a_1481_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR RESET_B a_697_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 a_798_463# a_839_359# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_823_138# a_839_359# a_901_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.cdl b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.cdl
index bea6517..b59a49d 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.cdl
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__dfrtp_4 CLK D RESET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net92 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net122 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net115 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net92 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net107 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net159 s0 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
-MI653 Q net159 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
-MI654 net91 net92 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net122 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK 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
-MI647 M1 M0 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net79 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net115 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net178 net92 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 net107 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net92 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net159 s0 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
+MI653 Q net159 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
+MI654 net91 net92 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK 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
+MI647 M1 M0 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
-MI658 net92 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net166 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net79 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos 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
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net178 net92 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net92 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net92 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net166 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net159 s0 VPB pfet_01v8_hvt m=2 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
+MI660 Q net159 VPB 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
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 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_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net159 s0 VPB phighvt m=2 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
-MI660 Q net159 VPB phighvt 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
-MI45 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 db RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 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_ls__dfrtp_4
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.netlist.tsv b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.netlist.tsv
index abab411..a46864b 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__dfrtp_4	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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net92	s0	net122	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net122	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net115	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net107	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net107	M1	net115	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net91	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net159	s0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net159	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net91	net92	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net79	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net79	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net178	net92	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net92	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net178	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net92	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net166	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net166	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net159	s0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net159	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net92	s0	net122	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net122	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net115	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net107	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net107	M1	net115	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net91	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net159	s0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net159	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net91	net92	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net79	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net178	net92	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net92	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net178	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net92	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net166	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net166	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net159	s0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net159	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.spice b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.spice
index 1dd0a0e..645a52f 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.spice
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.spice
@@ -16,82 +16,43 @@
 
 
 .subckt sky130_fd_sc_ls__dfrtp_4 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 VGND a_2010_409# Q VNB nshort w=740000u l=150000u
-+  ad=2.10185e+12p pd=1.715e+07u as=4.847e+11p ps=4.27e+06u
-M1001 a_1350_392# a_494_392# a_834_355# VNB nshort w=740000u l=150000u
-+  ad=4.58e+11p pd=3.28e+06u as=9.435e+11p ps=4.03e+06u
-M1002 VGND RESET_B a_124_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1003 a_2010_409# a_1350_392# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=3.136e+12p ps=2.402e+07u
-M1004 a_494_392# a_299_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.0255e+11p pd=2.07e+06u as=0p ps=0u
-M1005 VPWR a_2010_409# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=7.224e+11p ps=5.77e+06u
-M1006 a_699_463# a_494_392# a_37_78# VPB phighvt w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=2.478e+11p ps=2.86e+06u
-M1007 a_1627_493# a_494_392# a_1350_392# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=6.724e+11p ps=4.47e+06u
-M1008 VGND CLK a_299_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.4175e+11p ps=2.14e+06u
-M1009 a_834_355# a_699_463# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR CLK a_299_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.223e+11p ps=2.75e+06u
-M1011 a_789_463# a_299_392# a_699_463# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1012 a_124_78# D a_37_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1013 a_2010_409# a_1350_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_1678_395# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1015 a_834_355# a_699_463# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1016 VGND a_2010_409# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_494_392# a_299_392# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1018 a_890_138# a_834_355# a_812_138# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1019 Q a_2010_409# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1678_395# a_1647_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1021 a_37_78# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR RESET_B a_37_78# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_1350_392# a_1678_395# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1350_392# a_299_392# a_834_355# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_699_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_834_355# a_789_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1678_395# a_1350_392# a_1827_81# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1028 Q a_2010_409# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND RESET_B a_890_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1350_392# a_2010_409# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_2010_409# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Q a_2010_409# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1827_81# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_812_138# a_494_392# a_699_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1035 a_1647_81# a_299_392# a_1350_392# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Q a_2010_409# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_699_463# a_299_392# a_37_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_1678_395# a_1627_493# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_37_78# a_299_392# a_699_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1827_81# a_1350_392# a_1678_395# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_1350_392# a_2010_409# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_37_78# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_890_138# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_299_392# a_494_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_1350_392# a_299_392# a_1647_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_834_355# a_299_392# a_1350_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VPWR RESET_B a_1678_395# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_699_463# a_494_392# a_812_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1647_81# a_1678_395# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_299_392# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_2010_409# a_1350_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 VGND a_2010_409# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VPWR RESET_B a_699_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VGND RESET_B a_1827_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1350_392# a_494_392# a_1627_493# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_812_138# a_834_355# a_890_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 Q a_2010_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_37_78# a_494_392# a_699_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_789_463# a_834_355# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_124_78# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_37_78# D a_124_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_299_392# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_1627_493# a_1678_395# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 VPWR a_2010_409# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 Q a_2010_409# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 Q a_2010_409# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 a_1678_395# a_1350_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 VGND a_2010_409# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 VPWR a_299_392# a_494_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X31 a_834_355# a_494_392# a_1350_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 VGND a_1350_392# a_2010_409# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 VPWR a_699_463# a_834_355# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X34 VPWR D a_37_78# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 Q a_2010_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 VGND a_699_463# a_834_355# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 a_699_463# a_299_392# a_789_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X38 VPWR a_2010_409# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.cdl b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.cdl
index 02f9c3f..35e9b0a 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.cdl
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ls__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 net129 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net109 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net129 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net97 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net89 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net141 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net141 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
-MI49 Q_N S0 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
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net192 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net169 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI654 net109 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net97 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net89 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net156 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net141 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net141 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
+MI49 Q_N S0 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
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net141 S0 VPB 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
-MI660 Q net141 VPB 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
-MI50 Q_N S0 VPB 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
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net192 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net169 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net156 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net141 S0 VPB 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
+MI660 Q net141 VPB 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
+MI50 Q_N S0 VPB 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
 .ENDS sky130_fd_sc_ls__dfsbp_1
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.netlist.tsv b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.netlist.tsv
index 306f950..4523536 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.netlist.tsv
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ls__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	net129	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net112	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net109	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net129	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net97	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net89	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net89	S1	net97	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net141	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net141	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	Q_N	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net192	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net192	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net169	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net169	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net156	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net156	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net141	S0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net141	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	Q_N	S0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net129	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net112	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net109	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net129	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net97	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net89	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net89	S1	net97	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net141	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net141	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net192	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net192	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net169	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net169	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net156	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net156	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net141	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net141	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.spice b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.spice
index bcda941..d73e361 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.spice
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__dfsbp_1 CLK D SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_596_81# a_398_74# a_27_80# VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=2.478e+11p ps=2.86e+06u
-M1001 a_398_74# a_225_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=2.05505e+12p ps=1.739e+07u
-M1002 VGND D a_27_80# VNB nshort w=420000u l=150000u
-+  ad=1.56945e+12p pd=1.386e+07u as=2.394e+11p ps=2.82e+06u
-M1003 a_596_81# a_225_74# a_27_80# VNB nshort w=420000u l=150000u
-+  ad=2.562e+11p pd=2.06e+06u as=0p ps=0u
-M1004 a_728_463# a_225_74# a_596_81# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1005 VPWR SET_B a_779_380# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1006 a_1254_341# a_596_81# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.865e+11p pd=3.07e+06u as=0p ps=0u
-M1007 VGND a_779_380# a_748_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 a_779_380# a_596_81# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_1355_377# a_1510_48# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.596e+11p ps=1.6e+06u
-M1010 Q_N a_1355_377# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1011 a_1510_48# a_1355_377# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1012 a_398_74# a_225_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 a_1061_74# a_596_81# a_779_380# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1014 a_1355_377# a_398_74# a_1262_74# VNB nshort w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=2.176e+11p ps=1.96e+06u
-M1015 Q a_2113_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1016 VPWR D a_27_80# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Q_N a_1355_377# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1018 Q a_2113_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1019 a_748_81# a_398_74# a_596_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1355_377# a_225_74# a_1254_341# VPB phighvt w=1e+06u l=150000u
-+  ad=5.647e+11p pd=4.9e+06u as=0p ps=0u
-M1021 VPWR a_1510_48# a_1517_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1022 VGND SET_B a_1540_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1023 VGND a_1355_377# a_2113_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1024 VGND SET_B a_1061_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1355_377# a_2113_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1026 a_1540_74# a_1510_48# a_1462_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1027 a_1462_74# a_225_74# a_1355_377# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR CLK a_225_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1029 VGND CLK a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1030 a_1517_508# a_398_74# a_1355_377# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1355_377# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_779_380# a_728_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1262_74# a_596_81# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_596_81# a_1254_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_225_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_1355_377# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_1061_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1254_341# a_225_74# a_1355_377# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_225_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_1510_48# a_1355_377# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR SET_B a_1355_377# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_596_81# a_398_74# a_748_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_779_380# a_596_81# a_1061_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_1355_377# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND a_596_81# a_1262_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_1462_74# a_1510_48# a_1540_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_225_74# a_398_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_748_81# a_779_380# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_2113_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_27_80# a_398_74# a_596_81# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_27_80# a_225_74# a_596_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1262_74# a_398_74# a_1355_377# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_27_80# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_2113_74# a_1355_377# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_1540_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1355_377# a_398_74# a_1517_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_1355_377# a_225_74# a_1462_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_225_74# a_398_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_2113_74# a_1355_377# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X26 a_596_81# a_225_74# a_728_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 VGND a_1355_377# a_1510_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_2113_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_1517_508# a_1510_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_27_80# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 VPWR a_596_81# a_779_380# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 a_779_380# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_728_463# a_779_380# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.cdl b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.cdl
index fb347f6..3765df5 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.cdl
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ls__dfsbp_2 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 net128 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net79 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net128 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net96 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net88 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net111 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net140 S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net140 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
-MI49 Q_N S0 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
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net191 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net168 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI654 net79 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net96 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net88 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net155 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net111 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net140 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net140 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
+MI49 Q_N S0 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
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net140 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net140 VPB 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
-MI50 Q_N S0 VPB 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
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net191 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net168 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net155 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net140 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net140 VPB 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
+MI50 Q_N S0 VPB 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
 .ENDS sky130_fd_sc_ls__dfsbp_2
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.netlist.tsv b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.netlist.tsv
index b0be35a..3c31a10 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.netlist.tsv
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ls__dfsbp_2	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	net128	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net79	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net128	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net96	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net88	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net88	S1	net96	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net79	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net111	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net140	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net140	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	Q_N	S0	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net191	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net191	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net168	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net168	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net155	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net155	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net140	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net140	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	Q_N	S0	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net128	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net79	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net128	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net96	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net88	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net88	S1	net96	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net111	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net140	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net140	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net191	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net191	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net168	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net168	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net155	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net155	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net140	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net140	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.spice b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.spice
index 22cf464..3fa02d9 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.spice
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ls__dfsbp_2 CLK D SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1501_92# a_1339_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=2.28115e+12p ps=1.92e+07u
-M1001 VGND a_2221_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1002 a_398_74# a_225_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=2.9249e+12p ps=2.399e+07u
-M1003 a_595_97# a_398_74# a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=2.478e+11p ps=2.86e+06u
-M1004 VPWR a_757_401# a_706_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 a_757_401# a_595_97# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
-M1006 VGND a_1339_74# a_2221_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1007 VPWR a_1339_74# a_1501_92# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.544e+11p ps=2.27e+06u
-M1008 a_1261_74# a_595_97# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1009 Q_N a_1339_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1010 VPWR a_1501_92# a_1521_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1011 Q a_2221_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_706_463# a_225_74# a_595_97# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1521_508# a_398_74# a_1339_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=5.701e+11p ps=4.74e+06u
-M1014 a_595_97# a_225_74# a_27_74# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=2.394e+11p ps=2.82e+06u
-M1015 a_398_74# a_225_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1016 Q a_2221_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1017 VPWR D a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1339_74# a_398_74# a_1261_74# VNB nshort w=640000u l=150000u
-+  ad=2.314e+11p pd=2.12e+06u as=0p ps=0u
-M1019 a_1531_118# a_1501_92# a_1453_118# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1020 VGND a_1339_74# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1339_74# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_757_401# a_731_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1023 VGND SET_B a_1001_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1024 VPWR a_1339_74# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1025 VPWR a_2221_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1001_74# a_595_97# a_757_401# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1027 VGND D a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Q_N a_1339_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR CLK a_225_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1030 VPWR a_1339_74# a_2221_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1031 VGND CLK a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1032 a_1258_341# a_595_97# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.99625e+11p pd=3.22e+06u as=0p ps=0u
-M1033 a_1339_74# a_225_74# a_1258_341# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_731_97# a_398_74# a_595_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1453_118# a_225_74# a_1339_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR SET_B a_757_401# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND SET_B a_1531_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_2221_74# a_1339_74# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_1521_508# a_1501_92# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_225_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND a_2221_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_595_97# a_225_74# a_706_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR a_2221_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_1339_74# a_398_74# a_1521_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_595_97# a_398_74# a_731_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_225_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR a_595_97# a_1258_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_706_463# a_757_401# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_731_97# a_757_401# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_757_401# a_595_97# a_1001_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_1339_74# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND a_225_74# a_398_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Q a_2221_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR a_595_97# a_757_401# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VPWR SET_B a_1339_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_757_401# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_27_74# a_225_74# a_595_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_1339_74# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_1001_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1261_74# a_398_74# a_1339_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_1339_74# a_225_74# a_1453_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 Q a_2221_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_2221_74# a_1339_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 a_27_74# a_398_74# a_595_97# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 VGND a_595_97# a_1261_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 a_1258_341# a_225_74# a_1339_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 VPWR a_225_74# a_398_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_1453_118# a_1501_92# a_1531_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VGND a_1339_74# a_1501_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 Q_N a_1339_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 a_27_74# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 Q_N a_1339_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 a_1501_92# a_1339_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 a_1531_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.cdl b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.cdl
index ca91127..d48cfbb 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.cdl
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net71 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net120 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net88 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net80 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net103 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net128 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net128 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
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net179 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI654 net71 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net88 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net80 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net143 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net103 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net128 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net128 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
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net128 S0 VPB 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
-MI660 Q net128 VPB 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
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net128 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net128 VPB pfet_01v8_hvt m=1 w=1.12 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_ls__dfstp_1
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.netlist.tsv b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.netlist.tsv
index f69e711..36dbe89 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__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	net120	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net103	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net71	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net120	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net88	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net80	S1	net88	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net103	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net128	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net128	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net179	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net179	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net156	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net156	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net143	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net143	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net128	S0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net128	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net120	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net103	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net71	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net120	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net88	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net80	S1	net88	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net103	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net128	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net128	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net179	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net179	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net156	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net156	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net143	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net143	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net128	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net128	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.spice b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.spice
index 22e9b66..1672589 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.spice
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 VPWR CLK a_224_350# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.8422e+12p pd=1.597e+07u as=3.192e+11p ps=2.81e+06u
-M1001 VPWR SET_B a_760_395# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1002 a_1457_508# a_398_74# a_1298_392# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=5.488e+11p ps=4.68e+06u
-M1003 a_1298_392# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Q a_1902_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1005 a_1470_48# a_1298_392# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.40335e+12p ps=1.213e+07u
-M1006 a_1298_392# a_398_74# a_1215_74# VNB nshort w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=2.4e+11p ps=2.03e+06u
-M1007 a_709_463# a_224_350# a_604_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=1.47e+11p ps=1.54e+06u
-M1008 VGND SET_B a_1027_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 a_1027_118# a_604_74# a_760_395# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1010 a_604_74# a_224_350# a_27_74# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=2.9565e+11p ps=3.17e+06u
-M1011 a_398_74# a_224_350# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1012 Q a_1902_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 a_1422_74# a_224_350# a_1298_392# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1014 a_1500_74# a_1470_48# a_1422_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1015 a_398_74# a_224_350# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1016 a_1470_48# a_1298_392# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1017 VGND a_760_395# a_740_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1018 a_1197_341# a_604_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.99625e+11p pd=3.22e+06u as=0p ps=0u
-M1019 a_1298_392# a_224_350# a_1197_341# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND SET_B a_1500_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR D a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.436e+11p ps=2.84e+06u
-M1022 a_740_74# a_398_74# a_604_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_1298_392# a_1902_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1024 VGND D a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1470_48# a_1457_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND CLK a_224_350# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1027 a_604_74# a_398_74# a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_760_395# a_709_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_760_395# a_604_74# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1215_74# a_604_74# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1298_392# a_1902_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
+X0 a_27_74# a_398_74# a_604_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR a_604_74# a_760_395# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR a_604_74# a_1197_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_1298_392# a_398_74# a_1457_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_224_350# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_1298_392# a_1470_48# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR a_1902_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_760_395# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_1457_508# a_1470_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_604_74# a_224_350# a_709_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_1027_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_224_350# a_398_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_604_74# a_398_74# a_740_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1500_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_224_350# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_709_463# a_760_395# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VGND a_1298_392# a_1470_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1197_341# a_224_350# a_1298_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_1422_74# a_1470_48# a_1500_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_1902_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_1902_74# a_1298_392# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X21 VPWR SET_B a_1298_392# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_740_74# a_760_395# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_27_74# a_224_350# a_604_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_27_74# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_1215_74# a_398_74# a_1298_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VGND a_604_74# a_1215_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 VPWR a_224_350# a_398_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_760_395# a_604_74# a_1027_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1298_392# a_224_350# a_1422_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1902_74# a_1298_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.cdl b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.cdl
index e8ba034..fcb151a 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.cdl
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__dfstp_2 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net100 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net120 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net88 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net80 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net103 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net128 S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net128 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
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net179 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI654 net100 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net88 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net80 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net143 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net103 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net128 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net128 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
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net128 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net128 VPB 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
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net128 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net128 VPB pfet_01v8_hvt m=2 w=1.12 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_ls__dfstp_2
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.netlist.tsv b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.netlist.tsv
index 916983e..8b62de8 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__dfstp_2	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	net120	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net103	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net100	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net120	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net88	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net80	S1	net88	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net100	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net103	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net128	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net128	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net179	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net179	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net156	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net156	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net143	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net143	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net128	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net128	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net120	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net103	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net100	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net120	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net88	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net80	S1	net88	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net100	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net103	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net128	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net128	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net179	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net179	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net156	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net156	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net143	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net143	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net128	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net128	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.spice b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.spice
index 703c250..91c6316 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.spice
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__dfstp_2 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 a_612_74# a_398_74# a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=2.478e+11p ps=2.86e+06u
-M1001 a_1057_118# a_612_74# a_767_384# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1002 VGND SET_B a_1596_118# VNB nshort w=420000u l=150000u
-+  ad=1.6502e+12p pd=1.426e+07u as=1.764e+11p ps=1.68e+06u
-M1003 VGND a_2022_94# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 a_767_384# a_612_74# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=2.48148e+12p ps=2.007e+07u
-M1005 a_1266_341# a_612_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.99625e+11p pd=3.22e+06u as=0p ps=0u
-M1006 a_1356_74# a_225_74# a_1266_341# VPB phighvt w=1e+06u l=150000u
-+  ad=5.554e+11p pd=4.67e+06u as=0p ps=0u
-M1007 a_398_74# a_225_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1008 VPWR SET_B a_767_384# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1489_118# a_225_74# a_1356_74# VNB nshort w=420000u l=150000u
-+  ad=1.617e+11p pd=1.61e+06u as=2.713e+11p ps=2.31e+06u
-M1010 a_716_456# a_225_74# a_612_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1011 Q a_2022_94# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1012 VPWR a_1566_92# a_1521_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1013 a_1521_508# a_398_74# a_1356_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_781_74# a_398_74# a_612_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.919e+11p ps=2.23e+06u
-M1015 VGND a_1356_74# a_2022_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1016 a_398_74# a_225_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1017 VPWR a_2022_94# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR D a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_612_74# a_225_74# a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.0635e+11p ps=3.21e+06u
-M1020 VGND SET_B a_1057_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1356_74# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_767_384# a_781_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_2022_94# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1566_92# a_1356_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1025 a_1596_118# a_1566_92# a_1489_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND D a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_1356_74# a_2022_94# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1028 VPWR CLK a_225_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1029 VGND CLK a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1030 a_1566_92# a_1356_74# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.239e+11p pd=1.43e+06u as=0p ps=0u
-M1031 a_1278_74# a_612_74# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1032 a_1356_74# a_398_74# a_1278_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_767_384# a_716_456# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1278_74# a_398_74# a_1356_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_1521_508# a_1566_92# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_225_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_767_384# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_27_74# a_225_74# a_612_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1356_74# a_398_74# a_1521_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_1057_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_781_74# a_767_384# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_225_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_612_74# a_398_74# a_781_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_225_74# a_398_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_1266_341# a_225_74# a_1356_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VPWR a_2022_94# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND a_612_74# a_1278_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_27_74# a_398_74# a_612_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_1356_74# a_225_74# a_1489_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR a_1356_74# a_1566_92# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_2022_94# a_1356_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_1596_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_612_74# a_225_74# a_716_456# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VPWR a_225_74# a_398_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_716_456# a_767_384# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 Q a_2022_94# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 VGND a_1356_74# a_1566_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_27_74# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_2022_94# a_1356_74# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VGND a_2022_94# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 VPWR a_612_74# a_1266_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 a_1489_118# a_1566_92# a_1596_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 Q a_2022_94# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 VPWR SET_B a_1356_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 VPWR a_612_74# a_767_384# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_767_384# a_612_74# a_1057_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.cdl b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.cdl
index 0b9de48..8009535 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.cdl
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__dfstp_4 CLK D SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI36 net120 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI39 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net71 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI36 net120 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net88 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net80 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net103 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net128 S0 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
-MI653 Q net128 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
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net179 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI39 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net156 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI654 net71 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net88 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net80 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net143 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net103 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net128 S0 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
+MI653 Q net128 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
+MI40 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net128 S0 VPB phighvt m=2 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
-MI660 Q net128 VPB phighvt 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
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net156 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net143 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net128 S0 VPB pfet_01v8_hvt m=2 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
+MI660 Q net128 VPB 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
 .ENDS sky130_fd_sc_ls__dfstp_4
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.netlist.tsv b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.netlist.tsv
index e64f7bb..8582846 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__dfstp_4	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	net120	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net103	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net71	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net120	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net88	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net80	S1	net88	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net103	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net128	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net128	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net179	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net179	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net156	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net156	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net143	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net143	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net128	S0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net128	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net120	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net103	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net71	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net120	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net88	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net80	S1	net88	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net103	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net128	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net128	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net179	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net179	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net156	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net156	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net143	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net143	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net128	S0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net128	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.spice b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.spice
index 626b740..5cb7e0f 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.spice
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.spice
@@ -16,82 +16,43 @@
 
 
 .subckt sky130_fd_sc_ls__dfstp_4 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 a_767_402# a_612_74# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=2.7038e+12p ps=2.352e+07u
-M1001 VGND a_767_402# a_732_74# VNB nshort w=420000u l=150000u
-+  ad=2.1906e+12p pd=1.727e+07u as=1.008e+11p ps=1.32e+06u
-M1002 a_1484_62# a_1321_392# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_1321_392# a_398_74# a_1225_74# VNB nshort w=640000u l=150000u
-+  ad=2.1145e+11p pd=2e+06u as=2.528e+11p ps=2.07e+06u
-M1004 a_1514_88# a_1484_62# a_1436_88# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1005 VGND SET_B a_1514_88# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Q a_1940_74# VGND VNB nshort w=740000u l=150000u
-+  ad=4.477e+11p pd=4.17e+06u as=0p ps=0u
-M1007 VPWR SET_B a_767_402# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_1940_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1009 VGND a_1940_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_612_74# a_398_74# a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=2.478e+11p ps=2.86e+06u
-M1011 VPWR a_767_402# a_716_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1012 a_1940_74# a_1321_392# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1013 a_1321_392# a_225_74# a_1220_347# VPB phighvt w=1e+06u l=150000u
-+  ad=5.488e+11p pd=4.68e+06u as=3.94375e+11p ps=3.16e+06u
-M1014 a_1220_347# a_612_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_1940_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_1940_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_732_74# a_398_74# a_612_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.89e+11p ps=1.74e+06u
-M1018 a_1436_88# a_225_74# a_1321_392# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_716_463# a_225_74# a_612_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND SET_B a_1035_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1021 VGND a_1940_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_398_74# a_225_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1023 VPWR a_1321_392# a_1940_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_1484_62# a_1480_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1025 VPWR a_1940_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR CLK a_225_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1027 a_612_74# a_225_74# a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.0635e+11p ps=3.21e+06u
-M1028 a_1480_508# a_398_74# a_1321_392# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1035_118# a_612_74# a_767_402# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.491e+11p ps=1.55e+06u
-M1030 a_1484_62# a_1321_392# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1031 a_1225_74# a_612_74# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1321_392# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR D a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_398_74# a_225_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1035 VGND D a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Q a_1940_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND CLK a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1038 VGND a_1321_392# a_1940_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.627e+11p ps=2.19e+06u
+X0 a_1321_392# a_398_74# a_1480_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_716_463# a_767_402# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_732_74# a_767_402# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_225_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_74# a_225_74# a_612_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_1321_392# a_1484_62# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_1940_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR a_1321_392# a_1484_62# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 Q a_1940_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_612_74# a_767_402# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VPWR a_225_74# a_398_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND a_225_74# a_398_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR SET_B a_1321_392# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_1940_74# a_1321_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_767_402# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_1514_88# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1220_347# a_225_74# a_1321_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 VGND a_1940_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND a_1940_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_27_74# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_27_74# a_398_74# a_612_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VGND a_612_74# a_1225_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 Q a_1940_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_1035_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1321_392# a_225_74# a_1436_88# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 Q a_1940_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 Q a_1940_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_1940_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_1436_88# a_1484_62# a_1514_88# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1940_74# a_1321_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_612_74# a_225_74# a_716_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 VPWR a_612_74# a_1220_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X33 a_1480_508# a_1484_62# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 a_225_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 a_612_74# a_398_74# a_732_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_1321_392# a_1940_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X37 a_767_402# a_612_74# a_1035_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_1225_74# a_398_74# a_1321_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.cdl b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.cdl
index ceef425..dbb87ed 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.cdl
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net96 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI669 net88 S1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net72 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 Q_N net88 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
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI670 net88 S1 VPB 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
-MI643 net147 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI656 net96 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net128 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 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
-MI645 Q S1 VPB 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
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI669 net88 S1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 Q_N net88 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net72 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK 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
+MI636 clkpos clkneg 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
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 Q_N net88 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
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net88 S1 VPB 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
+MI643 net147 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB 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
+MI658 net128 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB 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
+MI637 clkpos clkneg VPB 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
+MI666 Q_N net88 VPB 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
 .ENDS sky130_fd_sc_ls__dfxbp_1
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.netlist.tsv b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.netlist.tsv
index a819153..1ccc4ef 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.netlist.tsv
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ls__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	net96	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net96	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net88	S1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net72	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	Q_N	net88	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net128	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net147	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net88	S1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net147	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net128	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	Q_N	net88	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net96	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net96	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net88	S1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net72	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	Q_N	net88	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net128	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net147	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net88	S1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net147	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net128	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	Q_N	net88	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.spice b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.spice
index 88707b5..33092e6 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.spice
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__dfxbp_1 CLK D VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_1191_120# a_1644_112# VPB phighvt w=840000u l=150000u
-+  ad=1.90825e+12p pd=1.568e+07u as=2.394e+11p ps=2.25e+06u
-M1001 VPWR a_701_463# a_650_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1002 a_543_447# a_27_74# a_420_503# VNB nshort w=420000u l=150000u
-+  ad=1.51375e+11p pd=1.66e+06u as=1.176e+11p ps=1.4e+06u
-M1003 VGND a_701_463# a_713_102# VNB nshort w=420000u l=150000u
-+  ad=1.71272e+12p pd=1.365e+07u as=8.82e+10p ps=1.26e+06u
-M1004 Q a_1191_120# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 Q_N a_1644_112# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.248e+11p pd=2.82e+06u as=0p ps=0u
-M1006 a_701_463# a_543_447# VGND VNB nshort w=550000u l=150000u
-+  ad=2.365e+11p pd=2.26e+06u as=0p ps=0u
-M1007 a_650_508# a_27_74# a_543_447# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.15075e+11p ps=2.22e+06u
-M1008 a_420_503# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_1005_120# a_1191_120# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1010 a_1005_120# a_205_368# a_701_463# VNB nshort w=550000u l=150000u
-+  ad=2.593e+11p pd=2.18e+06u as=0p ps=0u
-M1011 a_713_102# a_205_368# a_543_447# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_1191_120# a_1143_146# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1013 Q a_1191_120# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1014 a_1158_482# a_205_368# a_1005_120# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.817e+11p ps=2.45e+06u
-M1015 a_420_503# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.9275e+11p pd=2.67e+06u as=0p ps=0u
-M1016 a_205_368# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=3.252e+11p pd=2.59e+06u as=0p ps=0u
-M1017 a_701_463# a_543_447# VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.082e+11p pd=2.89e+06u as=0p ps=0u
-M1018 VGND a_1005_120# a_1191_120# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1019 a_1143_146# a_27_74# a_1005_120# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR CLK a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.248e+11p ps=2.82e+06u
-M1021 a_205_368# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1022 VGND a_1191_120# a_1644_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1023 VGND CLK a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1024 a_543_447# a_205_368# a_420_503# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1005_120# a_27_74# a_701_463# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q_N a_1644_112# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1027 VPWR a_1191_120# a_1158_482# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_420_503# a_205_368# a_543_447# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1191_120# a_1005_120# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_650_508# a_701_463# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_543_447# a_27_74# a_650_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_1143_146# a_1191_120# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1158_482# a_1191_120# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR a_1191_120# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_1644_112# a_1191_120# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 VGND a_27_74# a_205_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_543_447# a_701_463# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND D a_420_503# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_1005_120# a_27_74# a_1143_146# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_713_102# a_701_463# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND a_1191_120# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_1644_112# a_1191_120# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VGND a_1644_112# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_420_503# a_27_74# a_543_447# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1005_120# a_205_368# a_1158_482# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_543_447# a_205_368# a_713_102# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_701_463# a_27_74# a_1005_120# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 VPWR a_27_74# a_205_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_701_463# a_205_368# a_1005_120# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X23 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VPWR D a_420_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 VPWR a_1644_112# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VGND a_543_447# a_701_463# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X27 a_1191_120# a_1005_120# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.cdl b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.cdl
index 6720fb7..0f036d4 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.cdl
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ls__dfxbp_2 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 nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net96 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net76 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 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
-MI635 clkneg CLK 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 net52 S1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 Q_N net52 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
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=2 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI643 net147 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI656 net96 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net132 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 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
-MI645 Q S1 VPB 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
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI670 net52 S1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 Q_N net52 VPB 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net76 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 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
+MI635 clkneg CLK 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
+MI636 clkpos clkneg 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
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 net52 S1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 Q_N net52 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
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=2 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI643 net147 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB 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
+MI658 net132 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB 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
+MI670 net52 S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 Q_N net52 VPB 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
+MI637 clkpos clkneg VPB 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
 .ENDS sky130_fd_sc_ls__dfxbp_2
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.netlist.tsv b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.netlist.tsv
index eccc98b..078e906 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.netlist.tsv
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ls__dfxbp_2	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	net96	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net96	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net76	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net76	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net52	S1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	Q_N	net52	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net132	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net147	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net147	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net132	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net52	S1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	Q_N	net52	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net96	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net96	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net76	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net76	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net52	S1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	Q_N	net52	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net132	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net147	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net147	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net132	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net52	S1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	Q_N	net52	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.spice b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.spice
index ebe5bd5..4d543e0 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.spice
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.spice
@@ -16,70 +16,37 @@
 
 
 .subckt sky130_fd_sc_ls__dfxbp_2 CLK D VGND VNB VPB VPWR Q Q_N
-M1000 a_1248_128# a_27_74# a_1000_424# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.9205e+11p ps=3.36e+06u
-M1001 a_558_445# a_206_368# a_451_503# VPB phighvt w=420000u l=150000u
-+  ad=2.394e+11p pd=1.98e+06u as=2.1245e+11p ps=2.19e+06u
-M1002 Q a_1290_102# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=2.84038e+12p ps=2.25e+07u
-M1003 VGND a_753_284# a_717_102# VNB nshort w=420000u l=150000u
-+  ad=2.10485e+12p pd=1.739e+07u as=1.008e+11p ps=1.32e+06u
-M1004 Q a_1290_102# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 VPWR a_1290_102# a_1835_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1006 Q_N a_1835_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1007 a_753_284# a_558_445# VGND VNB nshort w=550000u l=150000u
-+  ad=3.87e+11p pd=2.98e+06u as=0p ps=0u
-M1008 VGND a_1835_368# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_1000_424# a_1290_102# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1010 VGND a_1290_102# a_1248_128# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_206_368# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=3.252e+11p pd=2.59e+06u as=0p ps=0u
-M1012 VPWR a_1835_368# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1013 a_1290_102# a_1000_424# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1000_424# a_206_368# a_753_284# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_1290_102# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_717_102# a_206_368# a_558_445# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.66075e+11p ps=1.73e+06u
-M1017 VGND a_1290_102# a_1835_368# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1018 VPWR a_753_284# a_702_445# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1019 VPWR a_1290_102# a_1208_479# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.785e+11p ps=1.69e+06u
-M1020 Q_N a_1835_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_753_284# a_558_445# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1022 VPWR CLK a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1023 a_206_368# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1024 a_702_445# a_27_74# a_558_445# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_1000_424# a_1290_102# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1026 a_1000_424# a_27_74# a_753_284# VPB phighvt w=840000u l=150000u
-+  ad=4.851e+11p pd=3.46e+06u as=0p ps=0u
-M1027 a_451_503# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1028 a_451_503# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND CLK a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1030 a_558_445# a_27_74# a_451_503# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1290_102# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1208_479# a_206_368# a_1000_424# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1835_368# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_702_445# a_753_284# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND a_1290_102# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND a_27_74# a_206_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_1208_479# a_1290_102# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_1248_128# a_1290_102# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Q a_1290_102# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_558_445# a_753_284# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_558_445# a_27_74# a_702_445# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_717_102# a_753_284# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_451_503# a_27_74# a_558_445# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1290_102# a_1000_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_1000_424# a_27_74# a_1248_128# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 Q a_1290_102# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_1290_102# a_1000_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR a_1000_424# a_1290_102# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VPWR a_1290_102# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_451_503# a_206_368# a_558_445# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_1835_368# a_1290_102# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X19 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 Q_N a_1835_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_1000_424# a_206_368# a_1208_479# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_753_284# a_27_74# a_1000_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 VPWR D a_451_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 VPWR a_27_74# a_206_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_1835_368# a_1290_102# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 VGND a_558_445# a_753_284# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X28 VGND D a_451_503# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_558_445# a_206_368# a_717_102# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 Q_N a_1835_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_753_284# a_206_368# a_1000_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X32 VGND a_1835_368# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.cdl b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.cdl
index dd2753c..713d044 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.cdl
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net79 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net59 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI643 net122 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI656 net79 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net107 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 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
-MI645 Q S1 VPB 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
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net59 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK 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
+MI636 clkpos clkneg 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
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB 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
+MI658 net107 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB 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
+MI637 clkpos clkneg VPB 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
 .ENDS sky130_fd_sc_ls__dfxtp_1
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.netlist.tsv b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.netlist.tsv
index c5046b0..7435efd 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ls__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	net79	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net79	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net59	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net107	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net107	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net79	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net59	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net107	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net107	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.spice b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.spice
index 1ed31e2..ae8adf7 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.spice
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__dfxtp_1 CLK D VGND VNB VPB VPWR Q
-M1000 VPWR a_713_458# a_668_503# VPB phighvt w=420000u l=150000u
-+  ad=1.50923e+12p pd=1.272e+07u as=1.008e+11p ps=1.32e+06u
-M1001 a_206_368# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.553e+11p pd=2.17e+06u as=1.2645e+12p ps=1.059e+07u
-M1002 a_1118_508# a_206_368# a_1011_424# VPB phighvt w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=2.856e+11p ps=2.45e+06u
-M1003 VPWR a_1210_314# a_1118_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_713_458# a_561_463# VGND VNB nshort w=550000u l=150000u
-+  ad=2.18125e+11p pd=2.05e+06u as=0p ps=0u
-M1005 a_1011_424# a_206_368# a_713_458# VNB nshort w=550000u l=150000u
-+  ad=2.362e+11p pd=2.07e+06u as=0p ps=0u
-M1006 a_454_503# D VGND VNB nshort w=420000u l=150000u
-+  ad=3.1125e+11p pd=2.43e+06u as=0p ps=0u
-M1007 VGND a_1011_424# a_1210_314# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1008 VPWR a_1011_424# a_1210_314# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1009 Q a_1210_314# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1010 Q a_1210_314# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1011 VGND a_713_458# a_731_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 a_454_503# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.967e+11p pd=2.01e+06u as=0p ps=0u
-M1013 a_668_503# a_27_74# a_561_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.967e+11p ps=2.01e+06u
-M1014 VPWR CLK a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1015 a_206_368# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1016 a_731_101# a_206_368# a_561_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.575e+11p ps=1.73e+06u
-M1017 a_561_463# a_27_74# a_454_503# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_713_458# a_561_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.662e+11p pd=2.79e+06u as=0p ps=0u
-M1019 a_1011_424# a_27_74# a_713_458# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1210_314# a_1168_124# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1021 a_561_463# a_206_368# a_454_503# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND CLK a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1023 a_1168_124# a_27_74# a_1011_424# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_561_463# a_713_458# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VPWR a_1210_314# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_713_458# a_206_368# a_1011_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 a_561_463# a_27_74# a_668_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_1168_124# a_1210_314# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_713_458# a_27_74# a_1011_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_561_463# a_206_368# a_731_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1011_424# a_27_74# a_1168_124# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_454_503# a_206_368# a_561_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND D a_454_503# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1118_508# a_1210_314# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_454_503# a_27_74# a_561_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_561_463# a_713_458# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X14 a_731_101# a_713_458# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1210_314# a_1011_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VPWR a_27_74# a_206_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND a_27_74# a_206_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_1011_424# a_206_368# a_1118_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VPWR D a_454_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_668_503# a_713_458# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VGND a_1210_314# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_1210_314# a_1011_424# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.cdl b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.cdl
index 8cb9bfc..a958e86 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.cdl
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ls__dfxtp_2 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 nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net79 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net59 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI643 net122 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI656 net79 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net107 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 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
-MI645 Q S1 VPB 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
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net59 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK 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
+MI636 clkpos clkneg 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
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB 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
+MI658 net107 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB 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
+MI637 clkpos clkneg VPB 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
 .ENDS sky130_fd_sc_ls__dfxtp_2
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.netlist.tsv b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.netlist.tsv
index 8d9db19..365ad91 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ls__dfxtp_2	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	net79	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net79	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net59	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net107	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net107	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net79	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net59	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net107	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net107	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.spice b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.spice
index bbb3f7f..5cffc77 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.spice
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ls__dfxtp_2 CLK D VGND VNB VPB VPWR Q
-M1000 VPWR a_1217_314# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.84205e+12p pd=1.538e+07u as=3.36e+11p ps=2.84e+06u
-M1001 VGND a_1217_314# a_1172_124# VNB nshort w=420000u l=150000u
-+  ad=1.65997e+12p pd=1.34e+07u as=1.008e+11p ps=1.32e+06u
-M1002 a_695_459# a_538_429# VGND VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=0p ps=0u
-M1003 a_644_504# a_27_74# a_538_429# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=2.25225e+11p ps=2.35e+06u
-M1004 Q a_1217_314# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 a_1019_424# a_206_368# a_695_459# VNB nshort w=550000u l=150000u
-+  ad=2.4555e+11p pd=2.35e+06u as=0p ps=0u
-M1006 a_538_429# a_206_368# a_431_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.30825e+11p ps=2.4e+06u
-M1007 a_1125_508# a_206_368# a_1019_424# VPB phighvt w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=2.814e+11p ps=2.44e+06u
-M1008 VPWR a_1217_314# a_1125_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_431_508# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1010 a_708_101# a_206_368# a_538_429# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.5225e+11p ps=1.67e+06u
-M1011 a_695_459# a_538_429# VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.25e+11p pd=2.93e+06u as=0p ps=0u
-M1012 a_538_429# a_27_74# a_431_508# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1172_124# a_27_74# a_1019_424# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_1019_424# a_1217_314# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1015 VGND a_1217_314# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR CLK a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1017 a_206_368# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1018 VPWR a_695_459# a_644_504# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_1019_424# a_1217_314# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1020 a_431_508# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Q a_1217_314# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND CLK a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1023 a_206_368# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.775e+11p pd=2.23e+06u as=0p ps=0u
-M1024 a_1019_424# a_27_74# a_695_459# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_695_459# a_708_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Q a_1217_314# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR D a_431_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1125_508# a_1217_314# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_1019_424# a_27_74# a_1172_124# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1217_314# a_1019_424# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 VGND D a_431_508# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_538_429# a_27_74# a_644_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_1217_314# a_1019_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_695_459# a_206_368# a_1019_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_1019_424# a_206_368# a_1125_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR a_538_429# a_695_459# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_1172_124# a_1217_314# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_27_74# a_206_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_431_508# a_27_74# a_538_429# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_538_429# a_206_368# a_708_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR a_1217_314# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_644_504# a_695_459# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_431_508# a_206_368# a_538_429# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VGND a_1217_314# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 Q a_1217_314# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR a_27_74# a_206_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_695_459# a_27_74# a_1019_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 VGND a_538_429# a_695_459# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X25 a_708_101# a_695_459# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.cdl b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.cdl
index 7bf1cb2..802b66e 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.cdl
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ls__dfxtp_4 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 nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net79 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net59 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 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
-MI635 clkneg CLK 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=2 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI643 net122 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI656 net79 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net107 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 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
-MI645 Q S1 VPB phighvt 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
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net59 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 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
+MI635 clkneg CLK 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
+MI636 clkpos clkneg 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
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=2 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB 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
+MI658 net107 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB 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
+MI637 clkpos clkneg VPB 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
 .ENDS sky130_fd_sc_ls__dfxtp_4
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.netlist.tsv b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.netlist.tsv
index 141fe41..30ada75 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ls__dfxtp_4	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	net79	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net79	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net59	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net107	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net107	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net79	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net59	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net107	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net107	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.spice b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.spice
index 100b4c3..0e91430 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.spice
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.spice
@@ -16,66 +16,35 @@
 
 
 .subckt sky130_fd_sc_ls__dfxtp_4 CLK D VGND VNB VPB VPWR Q
-M1000 Q a_1226_296# VGND VNB nshort w=740000u l=150000u
-+  ad=4.44e+11p pd=4.16e+06u as=1.88282e+12p ps=1.54e+07u
-M1001 a_1141_508# a_206_368# a_1034_424# VPB phighvt w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=2.856e+11p ps=2.45e+06u
-M1002 Q a_1226_296# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=2.4029e+12p ps=1.958e+07u
-M1003 VPWR a_1034_424# a_1226_296# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1004 Q a_1226_296# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_696_458# a_544_485# VGND VNB nshort w=550000u l=150000u
-+  ad=1.98e+11p pd=1.97e+06u as=0p ps=0u
-M1006 a_651_503# a_27_74# a_544_485# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.7745e+11p ps=1.79e+06u
-M1007 VPWR a_1226_296# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_437_503# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.7745e+11p pd=1.79e+06u as=0p ps=0u
-M1009 VPWR a_696_458# a_651_503# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_544_485# a_206_368# a_437_503# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_696_458# a_735_102# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 VGND a_1226_296# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Q a_1226_296# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_1226_296# a_1178_124# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.323e+11p ps=1.47e+06u
-M1015 VPWR CLK a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1016 a_206_368# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1017 a_735_102# a_206_368# a_544_485# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.51375e+11p ps=1.66e+06u
-M1018 a_1034_424# a_27_74# a_696_458# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.452e+11p ps=2.74e+06u
-M1019 a_437_503# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1020 a_544_485# a_27_74# a_437_503# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1034_424# a_206_368# a_696_458# VNB nshort w=550000u l=150000u
-+  ad=2.152e+11p pd=1.97e+06u as=0p ps=0u
-M1022 a_206_368# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.516e+11p pd=2.16e+06u as=0p ps=0u
-M1023 VPWR a_1226_296# a_1141_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_1034_424# a_1226_296# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1025 VGND CLK a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1026 VPWR a_1226_296# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_696_458# a_544_485# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1178_124# a_27_74# a_1034_424# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1226_296# a_1034_424# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_1226_296# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_544_485# a_696_458# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_437_503# a_206_368# a_544_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1034_424# a_27_74# a_1178_124# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_544_485# a_206_368# a_735_102# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_544_485# a_27_74# a_651_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_1226_296# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Q a_1226_296# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_1034_424# a_206_368# a_1141_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_696_458# a_27_74# a_1034_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_1141_508# a_1226_296# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 Q a_1226_296# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND D a_437_503# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_1226_296# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR D a_437_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_27_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VPWR a_1034_424# a_1226_296# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_735_102# a_696_458# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_27_74# a_206_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR a_1226_296# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VGND a_544_485# a_696_458# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X20 a_1226_296# a_1034_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_1178_124# a_1226_296# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VGND a_1226_296# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_437_503# a_27_74# a_544_485# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_696_458# a_206_368# a_1034_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X25 VPWR a_27_74# a_206_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_27_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 Q a_1226_296# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_1226_296# a_1034_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 a_651_503# a_696_458# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 Q a_1226_296# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/diode/sky130_fd_sc_ls__diode_2.spice b/cells/diode/sky130_fd_sc_ls__diode_2.spice
index 6b8177d..43306ed 100644
--- a/cells/diode/sky130_fd_sc_ls__diode_2.spice
+++ b/cells/diode/sky130_fd_sc_ls__diode_2.spice
@@ -16,5 +16,5 @@
 
 
 .subckt sky130_fd_sc_ls__diode_2 DIODE VGND VNB VPB VPWR
-D0 VNB DIODE ndiode p=7.32e+06u a=6.417e+11p
+X0 VNB DIODE sky130_fd_pr__diode_pw2nd p=7.32e+06u a=6.417e+11p
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.cdl b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.cdl
index 4fa98dd..b94afc7 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.cdl
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__dlclkp_1 CLK GATE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net75 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net63 CLK VPB 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
-MI658 net63 m1 VPB 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
-MI19 m1 M0 VPB 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
-MI38 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net54 GATE VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI662 net75 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB 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
-MI660 GCLK net63 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB 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
-MI655 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net99 CLK VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net63 m1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net91 GATE VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI659 net63 CLK VPB 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
-MI44 clkpos CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net63 m1 VPB 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
+MI19 m1 M0 VPB 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
+MI38 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net54 GATE VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net63 VPB 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
+MI20 m1 M0 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
-MI653 GCLK net63 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
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net110 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net99 CLK VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net63 m1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net91 GATE VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos 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
+MI44 clkpos CLK 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
+MI653 GCLK net63 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_ls__dlclkp_1
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.netlist.tsv b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.netlist.tsv
index de2bbf0..cec8768 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__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
-MI662	MOSFET	net75	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net75	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net63	CLK	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net63	m1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net54	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net54	GATE	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net63	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	M0	clkpos	net91	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net99	CLK	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net63	m1	net99	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net91	GATE	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net63	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net75	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net75	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net63	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net63	m1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net54	GATE	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net63	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	M0	clkpos	net91	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net99	CLK	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net63	m1	net99	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net91	GATE	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net63	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/dlclkp/sky130_fd_sc_ls__dlclkp_1.spice b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.spice
index af25b0f..aa1792b 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.spice
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__dlclkp_1 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 GCLK a_987_393# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=1.88295e+12p ps=1.214e+07u
-M1001 a_477_124# a_309_338# a_83_260# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.692e+11p ps=2.3e+06u
-M1002 VGND CLK a_315_54# VNB nshort w=740000u l=150000u
-+  ad=1.19302e+12p pd=9.54e+06u as=2.183e+11p ps=2.07e+06u
-M1003 a_309_338# a_315_54# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 VPWR CLK a_315_54# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1005 VPWR a_27_74# a_484_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1006 a_484_508# a_315_54# a_83_260# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.889e+11p ps=3.12e+06u
-M1007 VPWR a_27_74# a_987_393# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.604e+11p ps=2.3e+06u
-M1008 a_987_393# a_27_74# a_984_125# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1009 a_987_393# CLK VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_83_260# a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1011 a_984_125# CLK VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 GCLK a_987_393# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 a_83_260# a_309_338# a_258_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1014 VGND a_27_74# a_477_124# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_83_260# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1016 a_309_338# a_315_54# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1017 a_258_392# GATE VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_267_80# GATE VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1019 a_83_260# a_315_54# a_267_80# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_267_80# a_315_54# a_83_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND CLK a_984_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_484_508# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR CLK a_987_393# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 a_315_54# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_83_260# a_315_54# a_484_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_315_54# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_987_393# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_83_260# a_309_338# a_477_124# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_987_393# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND GATE a_267_80# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR GATE a_258_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_27_74# a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_477_124# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_258_392# a_309_338# a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VPWR a_315_54# a_309_338# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VGND a_315_54# a_309_338# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_74# a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_984_125# a_27_74# a_987_393# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VGND a_987_393# GCLK VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.cdl b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.cdl
index f168a51..31ff1c4 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.cdl
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__dlclkp_2 CLK GATE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net75 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net63 CLK VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net63 m1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB 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
-MI38 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net54 GATE VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI662 net75 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB 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
-MI660 GCLK net63 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB 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
-MI655 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net99 CLK 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
-MI656 net63 m1 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
-MI36 net91 GATE VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI659 net63 CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net63 m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net54 GATE VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net63 VPB 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
+MI20 m1 M0 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
-MI653 GCLK net63 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
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net110 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net99 CLK 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
+MI656 net63 m1 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
+MI36 net91 GATE VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos 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
+MI44 clkpos CLK 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
+MI653 GCLK net63 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
 .ENDS sky130_fd_sc_ls__dlclkp_2
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.netlist.tsv b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.netlist.tsv
index facc998..580202b 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__dlclkp_2	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
-MI662	MOSFET	net75	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net75	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net63	CLK	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net63	m1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net54	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net54	GATE	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net63	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	M0	clkpos	net91	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net99	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net63	m1	net99	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net91	GATE	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net63	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net75	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net75	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net63	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net63	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net54	GATE	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net63	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	M0	clkpos	net91	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net99	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net63	m1	net99	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net91	GATE	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net63	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.spice b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.spice
index c1372ae..6e4a76e 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.spice
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__dlclkp_2 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 VPWR CLK a_315_48# VPB phighvt w=840000u l=150000u
-+  ad=2.6426e+12p pd=1.594e+07u as=2.646e+11p ps=2.31e+06u
-M1001 a_83_244# a_315_338# a_264_392# VPB phighvt w=1e+06u l=150000u
-+  ad=4.267e+11p pd=3.3e+06u as=2.7e+11p ps=2.54e+06u
-M1002 GCLK a_1041_387# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=1.45355e+12p ps=1.19e+07u
-M1003 a_315_338# a_315_48# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1004 a_1041_387# CLK VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.25e+11p pd=2.65e+06u as=0p ps=0u
-M1005 a_264_392# GATE VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_494_118# a_315_338# a_83_244# VNB nshort w=420000u l=150000u
-+  ad=1.54875e+11p pd=1.7e+06u as=3.049e+11p ps=2.47e+06u
-M1007 VGND a_1041_387# GCLK VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_27_74# a_494_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_315_338# a_315_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1010 GCLK a_1041_387# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1011 VPWR a_83_244# a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1012 a_267_74# GATE VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1013 a_83_244# a_315_48# a_267_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND CLK a_315_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1015 a_1041_387# a_27_74# a_1044_119# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.554e+11p ps=1.9e+06u
-M1016 VPWR a_27_74# a_508_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1017 VPWR a_1041_387# GCLK VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_83_244# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1019 a_1044_119# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_508_508# a_315_48# a_83_244# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_27_74# a_1041_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR GATE a_264_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_508_508# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_267_74# a_315_48# a_83_244# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR CLK a_1041_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 GCLK a_1041_387# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND CLK a_1044_119# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND a_1041_387# GCLK VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_315_48# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_83_244# a_315_338# a_494_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 GCLK a_1041_387# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_27_74# a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND GATE a_267_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_315_48# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND a_315_48# a_315_338# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_1044_119# a_27_74# a_1041_387# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_27_74# a_83_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR a_1041_387# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_264_392# a_315_338# a_83_244# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_1041_387# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VPWR a_315_48# a_315_338# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_494_118# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_83_244# a_315_48# a_508_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.cdl b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.cdl
index 9349b9d..4fd23d4 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.cdl
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__dlclkp_4 CLK GATE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net75 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net63 CLK VPB 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
-MI658 net63 m1 VPB 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
-MI19 m1 M0 VPB 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
-MI38 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net54 GATE VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI662 net75 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB 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
-MI660 GCLK net63 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 m1 M0 VNB 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
-MI655 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net99 CLK 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
-MI656 net63 m1 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
-MI36 net91 GATE VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI659 net63 CLK VPB 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
-MI44 clkpos CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net63 m1 VPB 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
+MI19 m1 M0 VPB 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
+MI38 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net54 GATE VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 GCLK net63 VPB 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
+MI20 m1 M0 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
-MI653 GCLK net63 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
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net110 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net99 CLK 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
+MI656 net63 m1 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
+MI36 net91 GATE VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos 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
+MI44 clkpos CLK 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
+MI653 GCLK net63 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
 .ENDS sky130_fd_sc_ls__dlclkp_4
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.netlist.tsv b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.netlist.tsv
index 28ce861..e9d0e76 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__dlclkp_4	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
-MI662	MOSFET	net75	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net75	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net63	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net63	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net54	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net54	GATE	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net63	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	M0	clkpos	net91	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net99	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net63	m1	net99	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net91	GATE	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net63	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net75	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net75	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net63	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net63	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net54	GATE	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net63	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	M0	clkpos	net91	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net99	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net63	m1	net99	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net91	GATE	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net63	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.spice b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.spice
index bc834dc..25386a6 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.spice
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ls__dlclkp_4 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 VPWR a_1044_368# GCLK VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.1894e+12p pd=1.939e+07u as=6.888e+11p ps=5.71e+06u
-M1001 VGND a_27_74# a_491_124# VNB nshort w=420000u l=150000u
-+  ad=1.78525e+12p pd=1.468e+07u as=2.3775e+11p ps=2.39e+06u
-M1002 VPWR a_27_74# a_1044_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.752e+11p ps=2.91e+06u
-M1003 a_84_48# a_334_338# a_283_392# VPB phighvt w=1e+06u l=150000u
-+  ad=4.204e+11p pd=3.27e+06u as=2.7e+11p ps=2.54e+06u
-M1004 VPWR a_27_74# a_524_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 a_1047_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1006 GCLK a_1044_368# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1007 VPWR CLK a_334_54# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1008 VGND a_1044_368# GCLK VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_283_392# GATE VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_524_508# a_334_54# a_84_48# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_1044_368# GCLK VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_334_338# a_334_54# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1013 GCLK a_1044_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_491_124# a_334_338# a_84_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.587e+11p ps=2.25e+06u
-M1015 VGND a_1044_368# GCLK VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1044_368# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 GCLK a_1044_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_286_80# GATE VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1019 a_84_48# a_334_54# a_286_80# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND CLK a_334_54# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.333e+11p ps=2.19e+06u
-M1021 GCLK a_1044_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_84_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1023 a_1044_368# a_27_74# a_1047_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1024 VPWR a_84_48# a_27_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1025 a_334_338# a_334_54# VGND VNB nshort w=740000u l=150000u
-+  ad=2.675e+11p pd=2.66e+06u as=0p ps=0u
+X0 a_334_54# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 GCLK a_1044_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 GCLK a_1044_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_491_124# a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_524_508# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND GATE a_286_80# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_84_48# a_334_54# a_524_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_27_74# a_84_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_283_392# a_334_338# a_84_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VPWR GATE a_283_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 GCLK a_1044_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND a_334_54# a_334_338# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR a_1044_368# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_334_54# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_84_48# a_334_338# a_491_124# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_1044_368# GCLK VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 GCLK a_1044_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_74# a_84_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR CLK a_1044_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VGND a_1044_368# GCLK VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VPWR a_334_54# a_334_338# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 VGND CLK a_1047_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_1044_368# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_286_80# a_334_54# a_84_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 VPWR a_1044_368# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_1047_74# a_27_74# a_1044_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.cdl b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.cdl
index 8e6236c..7cbdc45 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.cdl
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrbn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI648 Q_N net125 VPB 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
-MI648 Q_N net125 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net125 m1 VPB 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
-MI650 Q m1 VPB 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI646 net125 m1 VPB 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
-MI658 m1 RESET_B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI18 net61 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net57 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI658 m1 RESET_B VPB 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
-MI647 Q_N net125 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
-MI649 Q m1 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
-MI645 net125 m1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net61 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net116 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net57 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB 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
+MI638 db D VPB 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
+MI634 clkpos GATE_N 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
+MI647 Q_N net125 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 net125 m1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net108 RESET_B 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
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net116 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net96 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net96 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrbn_1
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.netlist.tsv b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.netlist.tsv
index fcc5328..5b67c34 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.netlist.tsv
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ls__dlrbn_1	D:I GATE_N: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
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net125	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net61	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net125	m1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net61	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net57	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net57	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net125	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net125	m1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net108	RESET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net116	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net108	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net96	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net96	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net125	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net61	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net125	m1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net61	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net57	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net57	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net125	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net125	m1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net108	RESET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net116	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net108	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net96	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net96	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.spice b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.spice
index afdb41c..4965493 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.spice
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__dlrbn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_611_392# a_27_424# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.32665e+12p ps=1.625e+07u
-M1001 Q_N a_1437_112# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1002 a_608_74# a_27_424# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.4043e+12p ps=1.104e+07u
-M1003 a_686_74# a_231_74# a_608_74# VNB nshort w=640000u l=150000u
-+  ad=3.835e+11p pd=2.53e+06u as=0p ps=0u
-M1004 VPWR a_889_92# a_802_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.247e+11p ps=1.91e+06u
-M1005 a_802_508# a_231_74# a_686_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.328e+11p ps=2.77e+06u
-M1006 a_231_74# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 VGND RESET_B a_1133_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1008 VGND D a_27_424# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1009 VPWR a_231_74# a_373_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.83e+11p ps=2.88e+06u
-M1010 VGND a_889_92# a_1437_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.925e+11p ps=1.8e+06u
-M1011 VPWR a_889_92# a_1437_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1012 a_841_118# a_373_74# a_686_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1013 Q a_889_92# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.248e+11p pd=2.82e+06u as=0p ps=0u
-M1014 VGND a_231_74# a_373_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1015 a_1133_74# a_686_74# a_889_92# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1016 VPWR D a_27_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1017 Q a_889_92# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1018 a_231_74# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1019 Q_N a_1437_112# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1020 VGND a_889_92# a_841_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_889_92# a_686_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.472e+11p pd=2.86e+06u as=0p ps=0u
-M1022 a_686_74# a_373_74# a_611_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR RESET_B a_889_92# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1133_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR a_1437_112# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_373_74# a_231_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 VPWR a_889_92# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_608_74# a_231_74# a_686_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_611_392# a_373_74# a_686_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_1437_112# a_889_92# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 VPWR GATE_N a_231_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 VGND a_889_92# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_686_74# a_231_74# a_802_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_889_92# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR a_27_424# a_611_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_686_74# a_373_74# a_841_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_27_424# a_608_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_841_118# a_889_92# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_27_424# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X16 a_27_424# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_802_508# a_889_92# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_1437_112# a_889_92# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X19 VPWR a_686_74# a_889_92# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND GATE_N a_231_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_889_92# a_686_74# a_1133_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_373_74# a_231_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VGND a_1437_112# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.cdl b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.cdl
index fae1aef..3d6fd82 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.cdl
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrbn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI648 Q_N net125 VPB 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
-MI648 Q_N net125 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net125 m1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI646 net125 m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI18 net61 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net57 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI658 m1 RESET_B VPB 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
-MI647 Q_N net125 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
-MI649 Q m1 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
-MI645 net125 m1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net61 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net116 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net57 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB 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
+MI638 db D VPB 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
+MI634 clkpos GATE_N 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
+MI647 Q_N net125 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 net125 m1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net108 RESET_B 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
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net116 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net96 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net96 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrbn_2
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.netlist.tsv b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.netlist.tsv
index 4ab0368..6add3e0 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.netlist.tsv
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ls__dlrbn_2	D:I GATE_N: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
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net125	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net61	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net125	m1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net61	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net57	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net57	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net125	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net125	m1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net108	RESET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net116	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net108	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net96	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net96	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net125	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net61	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net125	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net61	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net57	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net57	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net125	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net125	m1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net108	RESET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net116	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net108	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net96	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net96	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.spice b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.spice
index 558f5f3..8147d06 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.spice
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__dlrbn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_783_508# a_230_74# a_670_74# VPB phighvt w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=3.478e+11p ps=2.8e+06u
-M1001 a_670_74# a_230_74# a_592_74# VNB nshort w=640000u l=150000u
-+  ad=2.44e+11p pd=2.18e+06u as=1.536e+11p ps=1.76e+06u
-M1002 a_592_74# a_27_112# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.80345e+12p ps=1.499e+07u
-M1003 a_670_74# a_363_74# a_595_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1004 VPWR a_838_48# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.8377e+12p pd=2.106e+07u as=3.36e+11p ps=2.84e+06u
-M1005 a_1446_368# a_838_48# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1006 a_230_74# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1007 a_230_74# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 Q_N a_1446_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1009 VGND D a_27_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1010 a_790_74# a_363_74# a_670_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1011 a_1446_368# a_838_48# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1012 VGND a_838_48# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1013 VPWR D a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1014 VGND a_1446_368# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.368e+11p ps=2.12e+06u
-M1015 a_838_48# a_670_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.472e+11p pd=2.86e+06u as=0p ps=0u
-M1016 a_595_392# a_27_112# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR RESET_B a_838_48# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_1446_368# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_230_74# a_363_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1020 VGND a_838_48# a_790_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_838_48# a_783_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_230_74# a_363_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.83e+11p ps=2.88e+06u
-M1023 Q a_838_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q_N a_1446_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1066_74# a_670_74# a_838_48# VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.109e+11p ps=2.05e+06u
-M1026 VGND RESET_B a_1066_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q a_838_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_112# a_595_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_363_74# a_230_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_592_74# a_230_74# a_670_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR a_838_48# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_363_74# a_230_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND GATE_N a_230_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND a_1446_368# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR GATE_N a_230_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_790_74# a_838_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_838_48# a_1446_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VPWR a_670_74# a_838_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND a_838_48# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR a_1446_368# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_670_74# a_363_74# a_790_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1066_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND a_27_112# a_592_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 Q a_838_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 Q a_838_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_595_392# a_363_74# a_670_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 Q_N a_1446_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_27_112# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_838_48# a_670_74# a_1066_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_670_74# a_230_74# a_783_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 VPWR a_838_48# a_1446_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X24 Q_N a_1446_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_783_508# a_838_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_27_112# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X27 a_838_48# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.cdl b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.cdl
index ed69434..9abfa6b 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.cdl
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrbp_1 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkpos clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB 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
+MI648 Q_N net125 VPB 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
-MI648 Q_N net125 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net125 m1 VPB 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
-MI650 Q m1 VPB 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
-MI633 clkneg GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI646 net125 m1 VPB 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
-MI658 m1 RESET_B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI18 net61 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net57 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkneg GATE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB 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
-MI647 Q_N net125 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
-MI649 Q m1 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
-MI645 net125 m1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB 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
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net116 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net61 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net57 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net125 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 net125 m1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net108 RESET_B 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
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net116 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net96 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net96 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrbp_1
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.netlist.tsv b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.netlist.tsv
index cacbaad..2964ca7 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.netlist.tsv
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ls__dlrbp_1	D:I GATE: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
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net125	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net61	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net125	m1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net61	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net57	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net57	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net125	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net125	m1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net108	RESET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net116	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net108	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net96	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net96	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net125	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net61	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net125	m1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net61	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net57	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net57	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net125	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net125	m1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net108	RESET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net116	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net108	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net96	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net96	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.spice b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.spice
index 18b9a30..a395728 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.spice
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__dlrbp_1 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 Q a_823_98# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.30975e+12p ps=1.109e+07u
-M1001 VGND D a_27_142# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1002 VGND a_226_104# a_353_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.59e+11p ps=2.18e+06u
-M1003 Q a_823_98# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=2.0626e+12p ps=1.529e+07u
-M1004 a_753_508# a_353_98# a_642_392# VPB phighvt w=420000u l=150000u
-+  ad=2.121e+11p pd=1.85e+06u as=3.528e+11p ps=2.81e+06u
-M1005 VGND a_823_98# a_775_124# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 VPWR a_823_98# a_753_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_571_80# a_27_142# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1008 a_642_392# a_353_98# a_571_80# VNB nshort w=640000u l=150000u
-+  ad=2.692e+11p pd=2.3e+06u as=0p ps=0u
-M1009 a_823_98# a_642_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.64e+11p pd=2.89e+06u as=0p ps=0u
-M1010 a_642_392# a_226_104# a_564_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1011 VPWR a_823_98# a_1342_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1012 VGND a_823_98# a_1342_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1013 Q_N a_1342_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1014 VPWR a_226_104# a_353_98# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1015 a_775_124# a_226_104# a_642_392# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_226_104# GATE VGND VNB nshort w=740000u l=150000u
-+  ad=2.701e+11p pd=2.21e+06u as=0p ps=0u
-M1017 VGND RESET_B a_1051_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1018 a_226_104# GATE VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.066e+11p pd=2.41e+06u as=0p ps=0u
-M1019 a_1051_74# a_642_392# a_823_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1020 Q_N a_1342_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.738e+11p pd=2.22e+06u as=0p ps=0u
-M1021 VPWR D a_27_142# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1022 a_564_392# a_27_142# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR RESET_B a_823_98# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_823_98# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_642_392# a_823_98# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_1342_74# a_823_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 VPWR a_1342_74# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_142# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 VPWR GATE a_226_104# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_753_508# a_823_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_823_98# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND a_1342_74# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_823_98# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_564_392# a_226_104# a_642_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_642_392# a_226_104# a_775_124# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_823_98# a_642_392# a_1051_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_27_142# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_775_124# a_823_98# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_642_392# a_353_98# a_753_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_571_80# a_353_98# a_642_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_353_98# a_226_104# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR a_27_142# a_564_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VGND GATE a_226_104# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_353_98# a_226_104# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_1051_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_1342_74# a_823_98# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X23 VGND a_27_142# a_571_80# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.cdl b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.cdl
index ebd0fc6..a050f21 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.cdl
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrbp_2 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkpos clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB 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
+MI648 Q_N net125 VPB 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
-MI648 Q_N net125 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net125 m1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkneg GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI646 net125 m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 m1 RESET_B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI18 net61 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net57 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkneg GATE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB 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
-MI647 Q_N net125 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
-MI649 Q m1 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
-MI645 net125 m1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net108 RESET_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB 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
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net116 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net61 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net57 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net125 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 net125 m1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net108 RESET_B 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
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net116 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net96 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net96 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrbp_2
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.netlist.tsv b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.netlist.tsv
index 7f9b178..df4ef4c 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.netlist.tsv
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_ls__dlrbp_2	D:I GATE: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
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net125	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net61	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net125	m1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net61	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net57	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net57	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net125	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net125	m1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net108	RESET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net116	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net108	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net96	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net96	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net125	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net61	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net125	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net61	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net57	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net57	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net125	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net125	m1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net108	RESET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net116	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net108	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net96	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net96	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.spice b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.spice
index f9ebd27..ededd73 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.spice
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__dlrbp_2 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_230_74# a_363_82# VNB nshort w=740000u l=150000u
-+  ad=1.8561e+12p pd=1.54e+07u as=2.109e+11p ps=2.05e+06u
-M1001 a_773_124# a_230_74# a_641_80# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.692e+11p ps=2.3e+06u
-M1002 a_569_80# a_27_112# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1003 VPWR a_821_98# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.8212e+12p pd=2.104e+07u as=3.36e+11p ps=2.84e+06u
-M1004 VGND a_821_98# a_1449_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1005 VPWR RESET_B a_821_98# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.92e+11p ps=2.94e+06u
-M1006 VGND RESET_B a_1049_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1007 Q_N a_1449_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1008 VPWR a_821_98# a_1449_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1009 a_230_74# GATE VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1010 a_641_80# a_230_74# a_566_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.328e+11p pd=2.77e+06u as=2.7e+11p ps=2.54e+06u
-M1011 Q_N a_1449_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1012 VGND D a_27_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1013 a_1049_74# a_641_80# a_821_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1014 VGND a_1449_368# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_230_74# GATE VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.898e+11p pd=2.37e+06u as=0p ps=0u
-M1016 a_566_392# a_27_112# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_821_98# a_773_124# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_1449_368# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1020 a_757_508# a_363_82# a_641_80# VPB phighvt w=420000u l=150000u
-+  ad=2.121e+11p pd=1.85e+06u as=0p ps=0u
-M1021 VPWR a_821_98# a_757_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_641_80# a_363_82# a_569_80# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_821_98# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1024 VGND a_821_98# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_230_74# a_363_82# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1026 Q a_821_98# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_821_98# a_641_80# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_821_98# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND GATE a_230_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_569_80# a_363_82# a_641_80# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR GATE a_230_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 a_821_98# a_641_80# a_1049_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_757_508# a_821_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR a_821_98# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_1449_368# a_821_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VPWR a_1449_368# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_1049_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 Q a_821_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_363_82# a_230_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 VGND a_1449_368# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_27_112# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 VPWR a_641_80# a_821_98# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_641_80# a_230_74# a_773_124# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 Q_N a_1449_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_641_80# a_363_82# a_757_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 VPWR a_27_112# a_566_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VGND a_27_112# a_569_80# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_1449_368# a_821_98# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_821_98# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 Q a_821_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 Q_N a_1449_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_27_112# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X25 a_363_82# a_230_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_773_124# a_821_98# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_566_392# a_230_74# a_641_80# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.cdl b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.cdl
index 0f5074d..bba512f 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.cdl
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrtn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI658 m1 RESET_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net54 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB 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
-MI657 net93 RESET_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net54 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B 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
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net81 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrtn_1
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.netlist.tsv b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.netlist.tsv
index b86118a..afeb585 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__dlrtn_1	D:I GATE_N: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	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net81	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net81	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.spice b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.spice
index cef100f..2914165 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.spice
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__dlrtn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR D a_27_136# VPB phighvt w=840000u l=150000u
-+  ad=1.81275e+12p pd=1.271e+07u as=2.478e+11p ps=2.27e+06u
-M1001 a_232_98# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=1.64835e+12p ps=1.063e+07u
-M1002 a_654_392# a_357_392# a_570_392# VPB phighvt w=1e+06u l=150000u
-+  ad=4.029e+11p pd=3.09e+06u as=2.7e+11p ps=2.54e+06u
-M1003 a_793_508# a_232_98# a_654_392# VPB phighvt w=420000u l=150000u
-+  ad=2.247e+11p pd=1.91e+06u as=0p ps=0u
-M1004 VGND a_897_406# a_854_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1005 a_570_392# a_27_136# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Q a_897_406# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1007 a_854_74# a_357_392# a_654_392# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.915e+11p ps=1.93e+06u
-M1008 VGND RESET_B a_1139_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1009 VPWR a_232_98# a_357_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1010 a_897_406# a_654_392# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=4.7e+11p pd=2.94e+06u as=0p ps=0u
-M1011 a_681_74# a_27_136# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1012 VGND D a_27_136# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1013 a_1139_74# a_654_392# a_897_406# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1014 Q a_897_406# VGND VNB nshort w=740000u l=150000u
-+  ad=2.701e+11p pd=2.21e+06u as=0p ps=0u
-M1015 VGND a_232_98# a_357_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1016 VPWR RESET_B a_897_406# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_654_392# a_232_98# a_681_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_897_406# a_793_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_232_98# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
+X0 a_357_392# a_232_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VGND GATE_N a_232_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_570_392# a_357_392# a_654_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_897_406# a_654_392# a_1139_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR a_654_392# a_897_406# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_854_74# a_897_406# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1139_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_27_136# a_570_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_27_136# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_27_136# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 VPWR a_897_406# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_793_508# a_897_406# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_681_74# a_232_98# a_654_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_654_392# a_232_98# a_793_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VGND a_27_136# a_681_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_897_406# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_654_392# a_357_392# a_854_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_897_406# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_357_392# a_232_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR GATE_N a_232_98# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.cdl b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.cdl
index 7871a0a..7892668 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.cdl
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrtn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI658 m1 RESET_B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI658 m1 RESET_B VPB 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
-MI18 net54 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net54 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB 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
-MI657 net106 RESET_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB 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
+MI638 db D VPB 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
+MI634 clkpos GATE_N 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net106 RESET_B 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
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net81 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrtn_2
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.netlist.tsv b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.netlist.tsv
index 886cc58..1fa8403 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__dlrtn_2	D:I GATE_N: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	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net106	RESET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net106	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net81	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net106	RESET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net106	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net81	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.spice b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.spice
index 76210fc..6b98da6 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.spice
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__dlrtn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 VGND RESET_B a_1153_74# VNB nshort w=740000u l=150000u
-+  ad=2.30995e+12p pd=1.387e+07u as=1.776e+11p ps=1.96e+06u
-M1001 a_232_98# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.257e+11p pd=2.09e+06u as=0p ps=0u
-M1002 a_1153_74# a_670_392# a_913_406# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1003 Q a_913_406# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 VGND a_232_98# a_373_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.294e+11p ps=2.1e+06u
-M1005 a_670_392# a_373_82# a_586_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.371e+11p pd=2.78e+06u as=2.7e+11p ps=2.54e+06u
-M1006 Q a_913_406# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=2.7852e+12p ps=1.673e+07u
-M1007 VGND a_913_406# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_697_74# a_27_136# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1009 a_670_392# a_232_98# a_697_74# VNB nshort w=640000u l=150000u
-+  ad=1.915e+11p pd=1.93e+06u as=0p ps=0u
-M1010 VPWR a_913_406# a_778_504# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.898e+11p ps=2.22e+06u
-M1011 a_586_392# a_27_136# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_913_406# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D a_27_136# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1014 VPWR D a_27_136# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1015 VGND a_913_406# a_870_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1016 VPWR a_232_98# a_373_82# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1017 a_913_406# a_670_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.472e+11p pd=2.86e+06u as=0p ps=0u
-M1018 VPWR RESET_B a_913_406# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_870_74# a_373_82# a_670_392# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_778_504# a_232_98# a_670_392# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_232_98# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
+X0 VGND GATE_N a_232_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_870_74# a_913_406# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_670_392# a_913_406# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_670_392# a_232_98# a_778_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_778_504# a_913_406# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Q a_913_406# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_1153_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_373_82# a_232_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_136# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 VPWR a_27_136# a_586_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_697_74# a_232_98# a_670_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_373_82# a_232_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_27_136# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 VPWR GATE_N a_232_98# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_586_392# a_373_82# a_670_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_670_392# a_373_82# a_870_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_913_406# a_670_392# a_1153_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_913_406# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VGND a_27_136# a_697_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VPWR a_913_406# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND a_913_406# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 Q a_913_406# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.cdl b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.cdl
index bebaee9..118d413 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.cdl
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrtn_4 D GATE_N RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI658 m1 RESET_B VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=2 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 net55 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net51 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB phighvt m=2 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
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net55 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB 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
-MI657 net94 RESET_B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MI653 net51 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net102 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8_hvt m=2 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
+MI638 db D VPB 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
+MI634 clkpos GATE_N 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net94 RESET_B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net102 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net82 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net82 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrtn_4
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.netlist.tsv b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.netlist.tsv
index 833a68d..00991f5 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__dlrtn_4	D:I GATE_N: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	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net55	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net55	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net51	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net51	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net94	RESET_B	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net102	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net94	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net82	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net82	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net55	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net55	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net51	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net51	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net94	RESET_B	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net102	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net94	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net82	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net82	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.spice b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.spice
index 2bd42de..da4983a 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.spice
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ls__dlrtn_4 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 a_1035_74# RESET_B VGND VNB nshort w=640000u l=150000u
-+  ad=5.44e+11p pd=5.54e+06u as=2.1144e+12p ps=1.632e+07u
-M1001 a_888_406# a_639_392# VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.628e+11p pd=4.7e+06u as=2.7364e+12p ps=2.028e+07u
-M1002 a_232_98# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1003 VGND a_888_406# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1004 VPWR a_888_406# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=7.84e+11p ps=5.88e+06u
-M1005 a_747_504# a_232_98# a_639_392# VPB phighvt w=420000u l=150000u
-+  ad=3.024e+11p pd=2.28e+06u as=3.371e+11p ps=2.78e+06u
-M1006 a_561_392# a_27_136# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 a_839_74# a_348_392# a_639_392# VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=1.915e+11p ps=1.93e+06u
-M1008 VPWR a_639_392# a_888_406# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR RESET_B a_888_406# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1035_74# a_639_392# a_888_406# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1011 Q a_888_406# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_232_98# a_348_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1013 Q a_888_406# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR D a_27_136# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1015 a_888_406# RESET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_888_406# a_839_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_639_392# a_232_98# a_666_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1018 a_666_74# a_27_136# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_639_392# a_348_392# a_561_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_888_406# a_747_504# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_232_98# a_348_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1022 VPWR a_888_406# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND RESET_B a_1035_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q a_888_406# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND D a_27_136# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1026 a_888_406# a_639_392# a_1035_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_232_98# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1028 Q a_888_406# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_888_406# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR RESET_B a_888_406# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VGND GATE_N a_232_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_888_406# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_888_406# a_639_392# a_1035_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_666_74# a_232_98# a_639_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_1035_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR GATE_N a_232_98# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 VGND RESET_B a_1035_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_348_392# a_232_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_348_392# a_232_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_27_136# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 VPWR a_639_392# a_888_406# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_839_74# a_888_406# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_888_406# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Q a_888_406# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_888_406# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VGND a_888_406# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Q a_888_406# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VPWR a_27_136# a_561_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VGND a_27_136# a_666_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_639_392# a_348_392# a_839_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_639_392# a_232_98# a_747_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VPWR a_888_406# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 Q a_888_406# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 Q a_888_406# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_888_406# a_639_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X26 a_27_136# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_747_504# a_888_406# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_561_392# a_348_392# a_639_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 a_1035_74# a_639_392# a_888_406# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.cdl b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.cdl
index 79198b6..227a2f7 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.cdl
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkneg GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI658 m1 RESET_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net54 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB 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
-MI634 clkneg GATE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB 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
-MI649 Q m1 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
-MI657 net93 RESET_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net54 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B 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
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net81 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrtp_1
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.netlist.tsv b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.netlist.tsv
index d3d0178..941b0f1 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net81	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net81	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.spice b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.spice
index 9cefe3d..78487a8 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.spice
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__dlrtp_1 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR RESET_B a_817_48# VPB phighvt w=1e+06u l=150000u
-+  ad=1.5813e+12p pd=1.156e+07u as=3.5e+11p ps=2.7e+06u
-M1001 a_643_74# a_216_424# a_568_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.328e+11p pd=2.77e+06u as=2.7e+11p ps=2.54e+06u
-M1002 a_216_424# GATE VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=9.349e+11p ps=8.16e+06u
-M1003 VGND RESET_B a_1045_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1004 a_568_392# a_27_424# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_817_48# a_759_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1006 a_769_74# a_216_424# a_643_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.907e+11p ps=2.24e+06u
-M1007 VGND a_817_48# a_769_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_216_424# GATE VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.3935e+11p pd=2.87e+06u as=0p ps=0u
-M1009 a_759_508# a_363_74# a_643_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_216_424# a_363_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=3.2225e+11p ps=2.64e+06u
-M1011 VPWR D a_27_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1012 Q a_817_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1013 Q a_817_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_1045_74# a_643_74# a_817_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1015 VPWR a_216_424# a_363_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1016 VGND D a_27_424# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1017 a_565_74# a_27_424# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1018 a_643_74# a_363_74# a_565_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_817_48# a_643_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_568_392# a_216_424# a_643_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_363_74# a_216_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_817_48# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VGND a_27_424# a_565_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VGND GATE a_216_424# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_817_48# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_643_74# a_216_424# a_769_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_817_48# a_643_74# a_1045_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_1045_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_363_74# a_216_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_27_424# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 VGND a_817_48# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_759_508# a_817_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_27_424# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_565_74# a_363_74# a_643_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 VPWR GATE a_216_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_643_74# a_363_74# a_759_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VPWR a_27_424# a_568_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 VPWR a_643_74# a_817_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_769_74# a_817_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.cdl b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.cdl
index dc9ec8f..29f388a 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.cdl
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrtp_2 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkneg GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI658 m1 RESET_B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB 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
-MI18 net54 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net50 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkneg GATE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB 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
-MI649 Q m1 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
-MI657 net93 RESET_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net54 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net101 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net50 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB 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
+MI638 db D VPB 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
+MI634 clkneg GATE 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net93 RESET_B 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
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net101 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net81 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net81 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrtp_2
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.netlist.tsv b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.netlist.tsv
index bff9b45..1c7212c 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__dlrtp_2	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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net54	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net54	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net50	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net50	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net93	RESET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net101	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net93	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net81	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net81	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net54	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net50	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net50	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net93	RESET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net101	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net93	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net81	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net81	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.spice b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.spice
index 5ddc566..9d2a724 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.spice
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__dlrtp_2 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 a_568_74# a_27_392# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.38725e+12p ps=1.126e+07u
-M1001 a_646_74# a_347_98# a_568_74# VNB nshort w=640000u l=150000u
-+  ad=3.21575e+11p pd=2.36e+06u as=0p ps=0u
-M1002 Q a_832_55# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.528e+11p pd=2.87e+06u as=2.24475e+12p ps=1.588e+07u
-M1003 VGND RESET_B a_1060_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1004 Q a_832_55# VGND VNB nshort w=740000u l=150000u
-+  ad=2.146e+11p pd=2.06e+06u as=0p ps=0u
-M1005 VPWR a_832_55# a_756_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.247e+11p ps=1.91e+06u
-M1006 VGND D a_27_392# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1007 a_832_55# a_646_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1008 a_646_74# a_235_74# a_565_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.328e+11p pd=2.77e+06u as=2.7e+11p ps=2.54e+06u
-M1009 a_235_74# GATE VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1010 a_565_392# a_27_392# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1060_74# a_646_74# a_832_55# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1012 VPWR D a_27_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1013 VGND a_832_55# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR RESET_B a_832_55# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_784_81# a_235_74# a_646_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1016 VGND a_832_55# a_784_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_235_74# a_347_98# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1018 a_756_508# a_347_98# a_646_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_235_74# GATE VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1020 VPWR a_832_55# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_235_74# a_347_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.701e+11p ps=2.21e+06u
+X0 a_832_55# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_832_55# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR GATE a_235_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 VGND a_27_392# a_568_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VGND a_832_55# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_784_81# a_832_55# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1060_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_347_98# a_235_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_832_55# a_646_74# a_1060_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_565_392# a_235_74# a_646_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 VPWR a_646_74# a_832_55# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_27_392# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 Q a_832_55# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_646_74# a_347_98# a_756_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VGND GATE a_235_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR a_27_392# a_565_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_646_74# a_235_74# a_784_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 Q a_832_55# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_347_98# a_235_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X19 a_756_508# a_832_55# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_568_74# a_347_98# a_646_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_27_392# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.cdl b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.cdl
index 6ce36b2..f91b489 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.cdl
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_ls__dlrtp_4 D GATE RESET_B VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkpos clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt 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
-MI633 clkneg GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI658 m1 RESET_B VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB 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
-MI18 net55 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net51 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB phighvt m=2 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
-MI638 db D VPB 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
-MI634 clkneg GATE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=2 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
-MI649 Q m1 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
-MI657 net94 RESET_B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MI18 net55 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net102 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net51 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=2 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
+MI638 db D VPB 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
+MI634 clkneg GATE 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net94 RESET_B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net102 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net82 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net82 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlrtp_4
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.netlist.tsv b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.netlist.tsv
index 24fe658..eb411a2 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_ls__dlrtp_4	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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net55	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net55	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net51	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net51	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net94	RESET_B	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net102	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	net94	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net82	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net82	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net55	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net55	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net51	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net51	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net94	RESET_B	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net102	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	net94	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net82	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net82	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.spice b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.spice
index f13b400..2894fdb 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.spice
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ls__dlrtp_4 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 a_240_394# GATE VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.94e+11p pd=2.38e+06u as=2.7109e+12p ps=2.052e+07u
-M1001 a_562_392# a_27_126# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1002 a_240_394# GATE VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.6158e+12p ps=1.463e+07u
-M1003 a_797_48# a_640_74# a_938_74# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=5.44e+11p ps=5.54e+06u
-M1004 VPWR D a_27_126# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1005 Q a_797_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.504e+11p pd=5.82e+06u as=0p ps=0u
-M1006 Q a_797_48# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1007 a_797_48# a_640_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.46e+11p pd=4.66e+06u as=0p ps=0u
-M1008 Q a_797_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_640_74# a_797_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_797_48# a_747_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.995e+11p ps=1.79e+06u
-M1011 VPWR a_797_48# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_640_74# a_240_394# a_562_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.328e+11p pd=2.77e+06u as=0p ps=0u
-M1013 VPWR a_797_48# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND D a_27_126# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1015 a_797_48# RESET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND RESET_B a_938_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_797_48# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_240_394# a_364_120# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.294e+11p ps=2.1e+06u
-M1019 Q a_797_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_797_48# a_755_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1021 VPWR a_240_394# a_364_120# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1022 VPWR RESET_B a_797_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_747_508# a_364_120# a_640_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_640_74# a_364_120# a_559_74# VNB nshort w=640000u l=150000u
-+  ad=2.555e+11p pd=2.13e+06u as=1.632e+11p ps=1.79e+06u
-M1025 a_938_74# RESET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_797_48# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_938_74# a_640_74# a_797_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_559_74# a_27_126# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_755_74# a_240_394# a_640_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Q a_797_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_797_48# a_640_74# a_938_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR a_640_74# a_797_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_562_392# a_240_394# a_640_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND a_27_126# a_559_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_364_120# a_240_394# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_126# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_747_508# a_797_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_797_48# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_797_48# a_640_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND a_797_48# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_938_74# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 VGND RESET_B a_938_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR RESET_B a_797_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_27_126# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X15 Q a_797_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR a_27_126# a_562_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 VGND GATE a_240_394# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR a_797_48# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VGND a_797_48# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_364_120# a_240_394# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 Q a_797_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_559_74# a_364_120# a_640_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 Q a_797_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_640_74# a_240_394# a_755_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_797_48# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X26 a_938_74# a_640_74# a_797_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 a_755_74# a_797_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR GATE a_240_394# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 a_640_74# a_364_120# a_747_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.cdl b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.cdl
index 3084368..efb061d 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.cdl
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__dlxbn_1 D GATE_N VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI648 Q_N net112 VPB 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
-MI648 Q_N net112 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net112 m1 VPB 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
-MI650 Q m1 VPB 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI646 net112 m1 VPB 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
-MI18 net56 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net52 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI647 Q_N net112 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
-MI649 Q m1 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
-MI645 net112 m1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net107 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI18 net56 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net52 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net112 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 net112 m1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net107 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net87 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net87 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlxbn_1
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.netlist.tsv b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.netlist.tsv
index 0e740dc..924adcd 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.netlist.tsv
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__dlxbn_1	D:I GATE_N: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
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net112	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net56	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net112	m1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net56	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net52	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net52	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net112	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net112	m1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net107	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net107	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net87	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net87	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net112	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net56	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net112	m1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net56	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net52	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net52	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net112	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net112	m1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net107	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net107	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net87	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net87	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.spice b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.spice
index a169f5f..25ffed4 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.spice
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__dlxbn_1 D GATE_N VGND VNB VPB VPWR Q Q_N
-M1000 a_805_392# a_232_82# a_653_79# VPB phighvt w=420000u l=150000u
-+  ad=1.407e+11p pd=1.51e+06u as=4.057e+11p ps=3.2e+06u
-M1001 a_232_82# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.4754e+12p ps=1.217e+07u
-M1002 a_863_294# a_653_79# VGND VNB nshort w=740000u l=150000u
-+  ad=2.183e+11p pd=2.07e+06u as=0p ps=0u
-M1003 a_571_392# a_27_120# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.8056e+12p ps=1.431e+07u
-M1004 VGND a_863_294# a_852_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 Q_N a_1347_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 VPWR D a_27_120# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.94e+11p ps=2.38e+06u
-M1007 VGND a_232_82# a_343_80# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=3.182e+11p ps=2.34e+06u
-M1008 VGND a_863_294# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 Q_N a_1347_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1010 a_852_123# a_343_80# a_653_79# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.099e+11p ps=2.97e+06u
-M1011 a_232_82# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1012 a_653_79# a_232_82# a_575_79# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1013 a_575_79# a_27_120# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_863_294# a_653_79# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1015 VPWR a_863_294# a_805_392# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1347_424# a_863_294# VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1017 VGND D a_27_120# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1018 VPWR a_232_82# a_343_80# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1019 VPWR a_863_294# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.136e+11p ps=2.8e+06u
-M1020 a_1347_424# a_863_294# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1021 a_653_79# a_343_80# a_571_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_575_79# a_232_82# a_653_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR a_1347_424# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR GATE_N a_232_82# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_571_392# a_343_80# a_653_79# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_653_79# a_343_80# a_852_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_653_79# a_232_82# a_805_392# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_343_80# a_232_82# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_27_120# a_571_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_343_80# a_232_82# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_805_392# a_863_294# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND GATE_N a_232_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Q a_863_294# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND a_27_120# a_575_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_653_79# a_863_294# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_852_123# a_863_294# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Q a_863_294# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_27_120# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X17 VGND a_1347_424# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND a_653_79# a_863_294# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VGND a_863_294# a_1347_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X20 VPWR a_863_294# a_1347_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_27_120# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.cdl b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.cdl
index efc2307..fd0421d 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.cdl
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__dlxbn_2 D GATE_N VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI648 Q_N net114 VPB 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
-MI648 Q_N net114 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net114 m1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI646 net114 m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net58 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net54 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI647 Q_N net114 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
-MI649 Q m1 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
-MI645 net114 m1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net109 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI18 net58 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net54 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net114 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 net114 m1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net109 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net89 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net89 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlxbn_2
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.netlist.tsv b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.netlist.tsv
index d35a55a..4791b2b 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.netlist.tsv
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__dlxbn_2	D:I GATE_N: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
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net114	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net58	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net114	m1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net58	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net54	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net54	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net114	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net114	m1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net109	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net89	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net89	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net114	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net58	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net114	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net58	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net54	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net54	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net114	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net114	m1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net109	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net89	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net89	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.spice b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.spice
index d035fbc..f35c04e 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.spice
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ls__dlxbn_2 D GATE_N VGND VNB VPB VPWR Q Q_N
-M1000 VPWR D a_27_136# VPB phighvt w=840000u l=150000u
-+  ad=2.5372e+12p pd=1.986e+07u as=3.192e+11p ps=2.44e+06u
-M1001 a_232_98# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.0325e+12p ps=1.669e+07u
-M1002 Q a_887_270# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 VPWR a_887_270# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1004 a_814_392# a_232_98# a_647_79# VPB phighvt w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=4.372e+11p ps=3.35e+06u
-M1005 VGND a_232_98# a_343_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.817e+11p ps=2.29e+06u
-M1006 a_232_98# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1007 Q_N a_1442_94# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1008 VPWR a_232_98# a_343_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1009 VGND a_887_270# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1442_94# a_887_270# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1011 Q_N a_1442_94# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1012 a_569_79# a_27_136# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1013 a_647_79# a_232_98# a_569_79# VNB nshort w=640000u l=150000u
-+  ad=3.952e+11p pd=2.9e+06u as=0p ps=0u
-M1014 a_647_79# a_343_74# a_565_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1015 VGND a_1442_94# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_887_270# a_647_79# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1017 a_1442_94# a_887_270# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1018 VPWR a_887_270# a_814_392# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_887_270# a_647_79# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1020 VPWR a_1442_94# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND D a_27_136# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1022 a_565_392# a_27_136# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_887_270# a_839_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1024 Q a_887_270# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_839_123# a_343_74# a_647_79# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_647_79# a_232_98# a_814_392# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND GATE_N a_232_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 Q a_887_270# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_569_79# a_232_98# a_647_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR a_887_270# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_27_136# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 a_839_123# a_887_270# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_887_270# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND a_647_79# a_887_270# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_1442_94# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND a_27_136# a_569_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_27_136# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 VGND a_887_270# a_1442_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_647_79# a_887_270# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Q a_887_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_343_74# a_232_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_647_79# a_343_74# a_839_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_565_392# a_343_74# a_647_79# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 VGND a_1442_94# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 Q_N a_1442_94# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VPWR a_27_136# a_565_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 VPWR GATE_N a_232_98# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 a_814_392# a_887_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 Q_N a_1442_94# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_343_74# a_232_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 VPWR a_887_270# a_1442_94# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.cdl b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.cdl
index ddf8f0a..850dc98 100644
--- a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.cdl
+++ b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__dlxbp_1 D GATE VGND VNB VPB VPWR Q Q_N
 *.PININFO D:I GATE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI635 clkpos clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB 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
+MI648 Q_N net114 VPB 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
-MI648 Q_N net114 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net114 m1 VPB 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
-MI650 Q m1 VPB 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
-MI633 clkneg GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI646 net114 m1 VPB 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
-MI18 net58 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net54 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkneg GATE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI647 Q_N net114 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
-MI649 Q m1 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
-MI645 net114 m1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net109 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB 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
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net58 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 net54 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net114 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 net114 m1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net109 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net89 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net89 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlxbp_1
diff --git a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.netlist.tsv b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.netlist.tsv
index 8bcf200..034ebe3 100644
--- a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.netlist.tsv
+++ b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__dlxbp_1	D:I GATE: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
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net114	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net58	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net114	m1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net58	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net54	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net54	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net114	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net114	m1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net109	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net89	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net89	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net114	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net58	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net114	m1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net58	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net54	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net54	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net114	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net114	m1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net109	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net89	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net89	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.spice b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.spice
index 71e2e10..9675f53 100644
--- a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.spice
+++ b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__dlxbp_1 D GATE VGND VNB VPB VPWR Q Q_N
-M1000 a_664_392# a_231_74# a_586_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.278e+11p pd=2.76e+06u as=2.4e+11p ps=2.48e+06u
-M1001 a_231_74# GATE VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.4685e+12p ps=1.184e+07u
-M1002 a_815_124# a_231_74# a_664_392# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.028e+11p ps=2.46e+06u
-M1003 VGND D a_27_413# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1004 Q_N a_1347_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.248e+11p pd=2.82e+06u as=2.07525e+12p ps=1.551e+07u
-M1005 a_770_508# a_373_82# a_664_392# VPB phighvt w=420000u l=150000u
-+  ad=2.121e+11p pd=1.85e+06u as=0p ps=0u
-M1006 a_863_98# a_664_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 VPWR a_863_98# a_770_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Q_N a_1347_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1009 a_664_392# a_373_82# a_589_80# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1010 a_589_80# a_27_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_863_98# a_664_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1012 a_586_392# a_27_413# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_863_98# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1014 VPWR a_231_74# a_373_82# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1015 a_1347_424# a_863_98# VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1016 VGND a_231_74# a_373_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1017 VPWR D a_27_413# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.436e+11p ps=2.26e+06u
-M1018 VGND a_863_98# a_815_124# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_863_98# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1020 a_1347_424# a_863_98# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.436e+11p pd=2.26e+06u as=0p ps=0u
-M1021 a_231_74# GATE VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
+X0 a_589_80# a_373_82# a_664_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 Q a_863_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_1347_424# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_413# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 a_815_124# a_863_98# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_27_413# a_586_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 Q a_863_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_373_82# a_231_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 VGND a_27_413# a_589_80# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VPWR GATE a_231_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_770_508# a_863_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_27_413# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X12 a_373_82# a_231_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR a_664_392# a_863_98# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND GATE a_231_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_586_392# a_231_74# a_664_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 VPWR a_863_98# a_1347_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 VGND a_664_392# a_863_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND a_863_98# a_1347_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X19 a_664_392# a_373_82# a_770_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VGND a_1347_424# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_664_392# a_231_74# a_815_124# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.cdl b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.cdl
index 6739d85..6d6480f 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.cdl
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_ls__dlxtn_1 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI18 net53 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net44 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI18 net53 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB 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
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net96 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net44 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net96 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net76 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net76 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlxtn_1
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.netlist.tsv b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.netlist.tsv
index d1973bb..38351d0 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_ls__dlxtn_1	D:I GATE_N: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	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net53	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net53	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net44	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net44	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net96	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net96	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net76	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net76	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net53	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net53	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net44	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net44	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net96	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net96	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net76	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net76	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.spice b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.spice
index 913e228..5e6c706 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.spice
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__dlxtn_1 D GATE_N VGND VNB VPB VPWR Q
-M1000 a_812_508# a_217_419# a_669_392# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=5.128e+11p ps=3.13e+06u
-M1001 Q a_863_441# VGND VNB nshort w=740000u l=150000u
-+  ad=2.146e+11p pd=2.06e+06u as=1.31878e+12p ps=1.016e+07u
-M1002 VGND a_217_419# a_369_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1003 VPWR a_217_419# a_369_392# VPB phighvt w=840000u l=150000u
-+  ad=1.57875e+12p pd=1.174e+07u as=2.478e+11p ps=2.27e+06u
-M1004 VGND D a_27_115# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1005 a_871_139# a_369_392# a_669_392# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.786e+11p ps=2.52e+06u
-M1006 a_217_419# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 a_863_441# a_669_392# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1008 a_669_392# a_369_392# a_585_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1009 Q a_863_441# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1010 VPWR D a_27_115# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1011 a_217_419# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.192e+11p pd=2.44e+06u as=0p ps=0u
-M1012 a_585_392# a_27_115# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_863_441# a_871_139# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_863_441# a_669_392# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1015 a_655_79# a_27_115# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1016 a_669_392# a_217_419# a_655_79# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_863_441# a_812_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_812_508# a_863_441# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_655_79# a_217_419# a_669_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_871_139# a_863_441# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_669_392# a_217_419# a_812_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_585_392# a_369_392# a_669_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_27_115# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 VGND a_669_392# a_863_441# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR a_863_441# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR GATE_N a_217_419# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 VPWR a_27_115# a_585_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_27_115# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 VGND GATE_N a_217_419# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_669_392# a_369_392# a_871_139# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_27_115# a_655_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 VGND a_863_441# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_369_392# a_217_419# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR a_669_392# a_863_441# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_369_392# a_217_419# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.cdl b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.cdl
index d5b25e9..550de92 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.cdl
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_ls__dlxtn_2 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI18 net51 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net47 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI18 net51 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB 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
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net94 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net47 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB 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
+MI638 db D VPB 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
+MI634 clkpos GATE_N 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net94 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net74 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net74 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlxtn_2
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.netlist.tsv b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.netlist.tsv
index 2438c65..b383d92 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_ls__dlxtn_2	D:I GATE_N: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	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net47	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net47	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net94	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net94	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net74	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net74	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net47	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net47	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net94	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net94	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net74	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net74	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.spice b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.spice
index 9725a5c..864bbea 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.spice
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__dlxtn_2 D GATE_N VGND VNB VPB VPWR Q
-M1000 a_658_79# a_27_120# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.54015e+12p ps=1.207e+07u
-M1001 a_232_82# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1002 VGND a_842_405# a_875_139# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1003 VPWR a_842_405# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.00335e+12p pd=1.509e+07u as=3.864e+11p ps=2.93e+06u
-M1004 VPWR a_842_405# a_791_503# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 VGND a_232_82# a_369_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1006 VPWR a_232_82# a_369_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1007 a_791_503# a_232_82# a_669_392# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.05175e+11p ps=2.92e+06u
-M1008 VGND a_842_405# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.516e+11p ps=2.16e+06u
-M1009 a_842_405# a_669_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1010 a_875_139# a_369_392# a_669_392# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.803e+11p ps=2.53e+06u
-M1011 a_669_392# a_369_392# a_585_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1012 a_585_392# a_27_120# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR D a_27_120# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1014 VGND D a_27_120# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1015 a_842_405# a_669_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1016 Q a_842_405# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_232_82# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1018 Q a_842_405# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_669_392# a_232_82# a_658_79# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_842_405# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_585_392# a_369_392# a_669_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_658_79# a_232_82# a_669_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VGND a_842_405# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR a_27_120# a_585_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 Q a_842_405# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_791_503# a_842_405# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND GATE_N a_232_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_120# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 VPWR GATE_N a_232_82# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_669_392# a_232_82# a_791_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 Q a_842_405# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR a_669_392# a_842_405# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND a_27_120# a_658_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_27_120# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X15 a_669_392# a_369_392# a_875_139# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_669_392# a_842_405# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_369_392# a_232_82# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_369_392# a_232_82# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X19 a_875_139# a_842_405# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.cdl b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.cdl
index b2c4239..5cf3947 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.cdl
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_ls__dlxtn_4 D GATE_N VGND VNB VPB VPWR Q
 *.PININFO D:I GATE_N:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI635 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB phighvt 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI18 net51 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net47 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB phighvt m=2 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
-MI638 db D VPB 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N VPB 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
+MI18 net51 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB 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
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net94 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 net47 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=2 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
+MI638 db D VPB 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
+MI634 clkpos GATE_N 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
+MI649 Q m1 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
-MI19 M0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net94 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net74 db VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net74 db VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlxtn_4
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.netlist.tsv b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.netlist.tsv
index c048f2a..a404e1a 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_ls__dlxtn_4	D:I GATE_N: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	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net47	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net47	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net94	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net94	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net74	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net74	db	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net47	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net47	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net94	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net94	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net74	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net74	db	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.spice b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.spice
index 307bdcc..733ece1 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.spice
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ls__dlxtn_4 D GATE_N VGND VNB VPB VPWR Q
-M1000 VPWR a_840_395# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.3143e+12p pd=1.737e+07u as=7.56e+11p ps=5.83e+06u
-M1001 a_658_79# a_27_115# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.78397e+12p ps=1.439e+07u
-M1002 a_591_392# a_27_115# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1003 VGND a_840_395# a_895_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 VPWR D a_27_115# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1005 a_840_395# a_675_392# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.982e+11p pd=2.39e+06u as=0p ps=0u
-M1006 VPWR a_675_392# a_840_395# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_230_424# a_369_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1008 Q a_840_395# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Q a_840_395# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_675_392# a_840_395# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1011 VPWR a_230_424# a_369_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1012 VPWR a_840_395# a_789_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1013 a_895_123# a_369_392# a_675_392# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.259e+11p ps=2.57e+06u
-M1014 VGND D a_27_115# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1015 VPWR a_840_395# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_840_395# VGND VNB nshort w=740000u l=150000u
-+  ad=5.143e+11p pd=4.35e+06u as=0p ps=0u
-M1017 a_230_424# GATE_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1018 Q a_840_395# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_789_508# a_230_424# a_675_392# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.475e+11p ps=2.84e+06u
-M1020 a_230_424# GATE_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1021 a_840_395# a_675_392# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_840_395# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_840_395# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_675_392# a_369_392# a_591_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_675_392# a_230_424# a_658_79# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Q a_840_395# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 Q a_840_395# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR a_675_392# a_840_395# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_675_392# a_230_424# a_789_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 Q a_840_395# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_895_123# a_840_395# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_658_79# a_230_424# a_675_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_27_115# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 VGND a_840_395# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_789_508# a_840_395# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND a_675_392# a_840_395# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_27_115# D VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X12 VGND GATE_N a_230_424# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_675_392# a_369_392# a_895_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_840_395# a_675_392# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 Q a_840_395# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VGND a_27_115# a_658_79# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VPWR GATE_N a_230_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VPWR a_840_395# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_840_395# a_675_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 VPWR a_840_395# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_591_392# a_369_392# a_675_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 VGND a_840_395# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_369_392# a_230_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VPWR a_27_115# a_591_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_369_392# a_230_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.cdl b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.cdl
index a71c78b..4296ce0 100644
--- a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.cdl
+++ b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB 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
+MI17 M0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 M0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 Q m1 VPB 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
-MI633 clkneg GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB 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
-MI18 net51 db VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 net47 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 m1 M0 VPB 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
-MI638 db D VPB 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
-MI634 clkneg GATE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE VPB 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
-MI649 Q m1 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
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net94 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 m1 M0 VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI18 net51 db VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 db D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net47 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net94 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 m1 M0 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
-MI20 net74 db VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI637 db D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos 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
+MI20 net74 db 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_ls__dlxtp_1
diff --git a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.netlist.tsv b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.netlist.tsv
index 9acf09a..c4df97a 100644
--- a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.netlist.tsv
+++ b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_ls__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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net47	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net47	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net94	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net94	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net74	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net74	db	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net47	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net47	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net94	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net94	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net74	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net74	db	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/dlxtp/sky130_fd_sc_ls__dlxtp_1.spice b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.spice
index 874f0ab..686b00f 100644
--- a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.spice
+++ b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__dlxtp_1 D GATE VGND VNB VPB VPWR Q
-M1000 a_592_149# a_562_123# a_229_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.328e+11p pd=2.77e+06u as=5.9e+11p ps=5.18e+06u
-M1001 VPWR a_592_149# a_386_326# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.69967e+12p pd=1.266e+07u as=3.696e+11p ps=2.9e+06u
-M1002 a_685_59# a_562_123# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.47895e+12p ps=1.06e+07u
-M1003 a_592_149# a_562_123# a_514_149# VNB nshort w=420000u l=150000u
-+  ad=2.753e+11p pd=2.41e+06u as=1.008e+11p ps=1.32e+06u
-M1004 Q a_386_326# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 a_419_392# a_685_59# a_592_149# VPB phighvt w=420000u l=150000u
-+  ad=3.1685e+11p pd=3.26e+06u as=0p ps=0u
-M1006 a_116_424# D VGND VNB nshort w=550000u l=150000u
-+  ad=1.815e+11p pd=1.76e+06u as=0p ps=0u
-M1007 VPWR GATE a_562_123# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1008 VGND a_592_149# a_386_326# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_116_424# D VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1010 a_514_149# a_386_326# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_116_424# a_229_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_685_59# a_562_123# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1013 a_239_85# a_685_59# a_592_149# VNB nshort w=740000u l=150000u
-+  ad=4.458e+11p pd=4.22e+06u as=0p ps=0u
-M1014 VGND GATE a_562_123# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.22e+11p ps=2.08e+06u
-M1015 a_419_392# a_386_326# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_386_326# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1017 VGND a_116_424# a_239_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND D a_116_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 a_229_392# a_116_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_592_149# a_685_59# a_239_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_229_392# a_562_123# a_592_149# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR a_386_326# a_419_392# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_386_326# a_592_149# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND a_386_326# a_514_149# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_562_123# a_685_59# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_239_85# a_116_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_562_123# GATE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND a_386_326# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_514_149# a_562_123# a_592_149# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR D a_116_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 VGND a_562_123# a_685_59# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_386_326# a_592_149# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_562_123# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_592_149# a_685_59# a_419_392# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VPWR a_386_326# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.cdl b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.cdl
index 6970146..5655175 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.cdl
+++ b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__dlygate4sd1_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net34 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net34 net30 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net30 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB 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
-MI7 net34 net30 VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlygate4sd1_1
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.netlist.tsv b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.netlist.tsv
index 53d4ca1..2efaef0 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.netlist.tsv
+++ b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__dlygate4sd1_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	net34	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net34	net30	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net30	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net34	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net30	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net34	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net34	net30	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net30	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net34	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net34	net30	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net30	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.spice b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.spice
index 25deaa5..0c3d264 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.spice
+++ b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__dlygate4sd1_1 A VGND VNB VPB VPWR X
-M1000 a_286_392# a_28_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=1.0405e+12p ps=6.4e+06u
-M1001 VGND a_286_392# a_405_138# VNB nshort w=420000u l=150000u
-+  ad=5.384e+11p pd=4.48e+06u as=2.562e+11p ps=2.06e+06u
-M1002 VPWR A a_28_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1003 X a_405_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1004 VPWR a_286_392# a_405_138# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.95e+11p ps=3.19e+06u
-M1005 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_405_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1007 a_286_392# a_28_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VPWR a_405_138# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_28_74# a_286_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_405_138# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_405_138# a_286_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_405_138# a_286_392# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_28_74# a_286_392# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.cdl b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.cdl
index 1fc6cf2..ffc35e4 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.cdl
+++ b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__dlygate4sd2_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net34 VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X Ab VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net34 net30 VNB nfet_01v8 m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net30 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net34 net30 VNB nshort m=1 w=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB 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
-MI7 net34 net30 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPB pfet_01v8_hvt m=1 w=1 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=1 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlygate4sd2_1
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.netlist.tsv b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.netlist.tsv
index 1ea08e6..47aee73 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.netlist.tsv
+++ b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__dlygate4sd2_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	net34	VGND	VNB	nshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net34	net30	VGND	VNB	nshort	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net30	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net34	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net30	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net34	VGND	VNB	nfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net34	net30	VGND	VNB	nfet_01v8	1	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net30	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net34	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net34	net30	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net30	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.spice b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.spice
index aea052c..124d1b3 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.spice
+++ b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__dlygate4sd2_1 A VGND VNB VPB VPWR X
-M1000 VPWR A a_28_74# VPB phighvt w=420000u l=150000u
-+  ad=9.405e+11p pd=6.2e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR a_288_74# a_405_138# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.1e+11p ps=3.02e+06u
-M1002 X a_405_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1003 a_288_74# a_28_74# VGND VNB nshort w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=5.258e+11p ps=4.42e+06u
-M1004 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND a_288_74# a_405_138# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=2.436e+11p ps=2e+06u
-M1006 X a_405_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1007 a_288_74# a_28_74# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
+X0 VPWR a_405_138# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR a_28_74# a_288_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_405_138# a_288_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND a_28_74# a_288_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X4 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_405_138# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_405_138# a_288_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
 .ends
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.cdl b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.cdl
index b782a23..40c945f 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.cdl
+++ b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__dlygate4sd3_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net34 VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net34 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab 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 net34 net30 VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI6 net34 net30 VNB nfet_01v8 m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net30 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net30 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab net34 VPB phighvt m=1 w=1 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 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
-MI7 net34 net30 VPB phighvt m=1 w=1 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPB pfet_01v8_hvt m=1 w=1 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_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
+MI7 net34 net30 VPB pfet_01v8_hvt m=1 w=1 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlygate4sd3_1
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.netlist.tsv b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.netlist.tsv
index 0ad2b28..f4ca657 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.netlist.tsv
+++ b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__dlygate4sd3_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	net34	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net34	net30	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net30	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net34	VPWR	VPB	phighvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	phighvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net30	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net34	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net34	net30	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net30	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net34	VPWR	VPB	pfet_01v8_hvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net34	net30	VPWR	VPB	pfet_01v8_hvt	1	1	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net30	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.spice b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.spice
index 919f653..0244b96 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.spice
+++ b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__dlygate4sd3_1 A VGND VNB VPB VPWR X
-M1000 VGND a_289_74# a_405_138# VNB nshort w=420000u l=500000u
-+  ad=3.935e+11p pd=3.79e+06u as=1.092e+11p ps=1.36e+06u
-M1001 VPWR a_289_74# a_405_138# VPB phighvt w=1e+06u l=500000u
-+  ad=6.905e+11p pd=5.7e+06u as=2.6e+11p ps=2.52e+06u
-M1002 VPWR A a_28_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1003 a_289_74# a_28_74# VPWR VPB phighvt w=1e+06u l=500000u
-+  ad=2.6e+11p pd=2.52e+06u as=0p ps=0u
-M1004 X a_405_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1005 VGND A a_28_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_405_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1007 a_289_74# a_28_74# VGND VNB nshort w=420000u l=500000u
-+  ad=1.092e+11p pd=1.36e+06u as=0p ps=0u
+X0 a_405_138# a_289_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X1 VPWR a_405_138# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND a_28_74# a_289_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X3 a_405_138# a_289_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X4 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_405_138# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR a_28_74# a_289_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
 .ends
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.cdl b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.cdl
index 2e272f3..126d2bc 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.cdl
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__dlymetal6s2s_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net55 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net55 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 net59 Ab 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 net55 net47 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
+MI15 net51 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 net59 Ab VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net47 X VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net55 net47 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 X net51 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
-MI15 net51 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net47 X VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 X net51 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
-MMIP1 Ab net55 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 net59 Ab VPB 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
-MI7 net55 net47 VPB 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
-MI8 net47 X VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 X net51 VPB 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
-MI17 net51 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net55 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 net59 Ab VPB 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
+MI7 net55 net47 VPB 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
+MI8 net47 X VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 X net51 VPB 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
+MI17 net51 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlymetal6s2s_1
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.netlist.tsv b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.netlist.tsv
index 8e197f6..84df715 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.netlist.tsv
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__dlymetal6s2s_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	net55	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	net59	Ab	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net55	net47	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net51	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net47	X	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	X	net51	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net55	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	net59	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net55	net47	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net47	X	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	X	net51	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net51	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net55	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	net59	Ab	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net55	net47	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net51	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net47	X	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	X	net51	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net55	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	net59	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net55	net47	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net47	X	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	X	net51	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net51	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.spice b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.spice
index 570c0eb..c90792e 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.spice
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__dlymetal6s2s_1 A VGND VNB VPB VPWR X
-M1000 VGND a_497_74# a_604_138# VNB nshort w=420000u l=150000u
-+  ad=6.828e+11p pd=6.48e+06u as=1.113e+11p ps=1.37e+06u
-M1001 X a_28_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1002 a_785_74# a_604_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=1.043e+12p ps=8.92e+06u
-M1003 a_785_74# a_604_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1004 VGND A a_28_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_497_74# a_316_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1006 VGND X a_316_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR X a_316_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1008 VPWR a_497_74# a_604_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1009 X a_28_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1010 a_497_74# a_316_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1011 VPWR A a_28_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
+X0 a_604_138# a_497_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_604_138# a_497_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_316_138# a_497_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND a_604_138# a_785_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND a_316_138# a_497_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_28_138# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND a_28_138# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_28_138# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR a_604_138# a_785_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_316_138# X VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_316_138# X VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_28_138# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.cdl b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.cdl
index 5fd56e2..c2844c4 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.cdl
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__dlymetal6s4s_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab X VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab X VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 net59 Ab 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 X net47 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
-MI15 net51 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net47 net43 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net43 net51 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
-MMIP1 Ab X VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 net59 Ab VPB 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
-MI7 X net47 VPB 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
-MI8 net47 net43 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net43 net51 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMIN2 net59 Ab 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
-MI17 net51 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 X net47 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
+MI15 net51 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net47 net43 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net43 net51 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
+MMIP1 Ab X VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 net59 Ab VPB 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
+MI7 X net47 VPB 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
+MI8 net47 net43 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net43 net51 VPB 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
+MI17 net51 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlymetal6s4s_1
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.netlist.tsv b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.netlist.tsv
index f0b0872..c3fcb78 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.netlist.tsv
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__dlymetal6s4s_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	X	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	net59	Ab	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	X	net47	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net51	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net47	net43	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net43	net51	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	X	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	net59	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	net47	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net47	net43	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net43	net51	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net51	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	X	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	net59	Ab	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	X	net47	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net51	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net47	net43	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net43	net51	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	X	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	net59	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	net47	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net47	net43	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net43	net51	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net51	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.spice b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.spice
index a360e35..92d8fcb 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.spice
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__dlymetal6s4s_1 A VGND VNB VPB VPWR X
-M1000 VGND X a_604_138# VNB nshort w=420000u l=150000u
-+  ad=6.828e+11p pd=6.48e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_209_74# a_28_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1002 a_785_74# a_604_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=1.043e+12p ps=8.92e+06u
-M1003 a_785_74# a_604_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1004 VGND A a_28_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 X a_316_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1006 VGND a_209_74# a_316_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR a_209_74# a_316_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1008 VPWR X a_604_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1009 a_209_74# a_28_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1010 X a_316_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1011 VPWR A a_28_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
+X0 a_604_138# X VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_604_138# X VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_316_138# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND a_604_138# a_785_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND a_316_138# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_28_138# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND a_28_138# a_209_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_28_138# a_209_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR a_604_138# a_785_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_316_138# a_209_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_316_138# a_209_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_28_138# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.cdl b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.cdl
index 9c48798..f4e0745 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.cdl
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__dlymetal6s6s_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net56 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB 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 net56 net48 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
-MI15 net52 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net48 net44 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net44 net52 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
-MMIP1 Ab net56 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB 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
-MI7 net56 net48 VPB 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
-MI8 net48 net44 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net44 net52 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMIN1 Ab net56 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 net52 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab 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 net56 net48 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
+MI15 net52 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net48 net44 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 net44 net52 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
+MMIP1 Ab net56 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net56 net48 VPB 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
+MI8 net48 net44 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net44 net52 VPB 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
+MI17 net52 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__dlymetal6s6s_1
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.netlist.tsv b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.netlist.tsv
index d873651..34ee2d9 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.netlist.tsv
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__dlymetal6s6s_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	net56	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net56	net48	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net52	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net48	net44	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net44	net52	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net56	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net56	net48	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net48	net44	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net44	net52	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net52	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net56	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net56	net48	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net52	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net48	net44	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net44	net52	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	net56	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net56	net48	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net48	net44	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net44	net52	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net52	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.spice b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.spice
index e2bac0d..cb47e69 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.spice
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__dlymetal6s6s_1 A VGND VNB VPB VPWR X
-M1000 VGND a_497_74# a_604_138# VNB nshort w=420000u l=150000u
-+  ad=6.828e+11p pd=6.48e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_209_74# a_28_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1002 X a_604_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=1.043e+12p ps=8.92e+06u
-M1003 X a_604_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1004 VGND A a_28_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_497_74# a_316_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1006 VGND a_209_74# a_316_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR a_209_74# a_316_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1008 VPWR a_497_74# a_604_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1009 a_209_74# a_28_138# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1010 a_497_74# a_316_138# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1011 VPWR A a_28_138# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
+X0 a_604_138# a_497_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_604_138# a_497_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_316_138# a_497_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND a_604_138# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND a_316_138# a_497_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_28_138# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND a_28_138# a_209_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_28_138# a_209_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR a_604_138# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_316_138# a_209_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_316_138# a_209_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_28_138# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.cdl b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.cdl
index be3b0c0..9ffd5b2 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.cdl
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__ebufn_1 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net35 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
-MMN1 sndA net39 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
-MMIN1 net39 TE_B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net35 A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB 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
-MMP1 sndTEB net35 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 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
-MMIP1 net39 TE_B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMIN1 net39 TE_B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 A VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net35 A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB 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
+MMP1 sndTEB net35 VPB 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
+MMIP1 net39 TE_B VPB 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
+MI5 net35 A VPB 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
 .ENDS sky130_fd_sc_ls__ebufn_1
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.netlist.tsv b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.netlist.tsv
index 20ca495..24743be 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__ebufn_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	net35	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net35	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net35	Z	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	A	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net35	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net35	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net35	Z	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.spice b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.spice
index a314ec5..54aa9c5 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.spice
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__ebufn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 a_229_74# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.562e+11p pd=2.29e+06u as=7.861e+11p ps=5.87e+06u
-M1001 VPWR TE_B a_27_404# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1002 Z a_229_74# a_566_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=3.024e+11p ps=2.78e+06u
-M1003 a_566_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_229_74# A VGND VNB nshort w=550000u l=150000u
-+  ad=1.4575e+11p pd=1.63e+06u as=3.759e+11p ps=3.75e+06u
-M1005 a_569_74# a_27_404# VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1006 Z a_229_74# a_569_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 VGND TE_B a_27_404# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
+X0 VPWR A a_229_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VGND A a_229_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 a_27_404# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_569_74# a_229_74# Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR TE_B a_566_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_566_368# a_229_74# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_27_404# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 VGND a_27_404# a_569_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.cdl b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.cdl
index d40cbb4..82b446f 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.cdl
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__ebufn_2 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net35 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
-MMN1 sndA net39 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
-MMIN1 net39 TE_B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net35 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB 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
-MMP1 sndTEB net35 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 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
-MMIP1 net39 TE_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 net39 TE_B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net35 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net35 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net39 TE_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__ebufn_2
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.netlist.tsv b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.netlist.tsv
index 601ab0c..5ae59f3 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__ebufn_2	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	net35	sndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net35	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net35	Z	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net35	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net35	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net35	Z	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.spice b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.spice
index 2c53909..3577d7f 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.spice
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__ebufn_2 A TE_B VGND VNB VPB VPWR Z
-M1000 a_84_48# A VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=4.797e+11p ps=4.17e+06u
-M1001 VPWR TE_B a_33_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0815e+12p pd=6.56e+06u as=1.0528e+12p ps=8.6e+06u
-M1002 a_33_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR TE_B a_283_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1004 VGND a_283_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=7.289e+11p ps=6.41e+06u
-M1005 a_27_74# a_283_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_84_48# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1007 Z a_84_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1008 a_27_74# a_84_48# Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND TE_B a_283_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1010 a_33_368# a_84_48# Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.92e+11p ps=2.94e+06u
-M1011 Z a_84_48# a_33_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_33_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Z a_84_48# a_33_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_33_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_283_48# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND a_283_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_74# a_283_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_283_48# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VPWR TE_B a_33_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND A a_84_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR A a_84_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.cdl b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.cdl
index 6b49163..e983e4b 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.cdl
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__ebufn_4 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net35 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
-MMN1 sndA net39 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
-MMIN1 net39 TE_B 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 net35 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
-MMP0 VPWR TE_B VPB phighvt 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
-MMP1 sndTEB net35 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 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
-MMIP1 net39 TE_B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMIN1 net39 TE_B 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
-MI5 net35 A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net35 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
+MMP0 VPWR TE_B VPB 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
+MMP1 sndTEB net35 VPB 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
+MMIP1 net39 TE_B VPB 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
+MI5 net35 A VPB 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
 .ENDS sky130_fd_sc_ls__ebufn_4
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.netlist.tsv b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.netlist.tsv
index a54cf19..6504be6 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__ebufn_4	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	net35	sndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net35	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net35	Z	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net35	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net35	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net35	Z	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.spice b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.spice
index 48833c1..526b18a 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.spice
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__ebufn_4 A TE_B VGND VNB VPB VPWR Z
-M1000 a_208_74# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=1.036e+12p ps=8.57e+06u
-M1001 a_348_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.6632e+12p pd=1.417e+07u as=0p ps=0u
-M1002 Z a_27_368# a_348_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1003 VGND A a_27_368# VNB nshort w=740000u l=150000u
-+  ad=6.216e+11p pd=6.12e+06u as=2.109e+11p ps=2.05e+06u
-M1004 a_378_74# a_27_368# Z VNB nshort w=740000u l=150000u
-+  ad=1.0323e+12p pd=1.019e+07u as=4.292e+11p ps=4.12e+06u
-M1005 VGND a_208_74# a_378_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_378_74# a_208_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR TE_B a_348_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_348_368# a_27_368# Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR TE_B a_348_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_208_74# a_378_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_208_74# TE_B VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1012 a_348_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_378_74# a_27_368# Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z a_27_368# a_378_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1016 a_378_74# a_208_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z a_27_368# a_348_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Z a_27_368# a_378_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_348_368# a_27_368# Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR TE_B a_348_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR TE_B a_348_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_378_74# a_208_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_348_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_368# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR TE_B a_208_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_348_368# a_27_368# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Z a_27_368# a_378_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_348_368# a_27_368# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Z a_27_368# a_348_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_348_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND a_208_74# a_378_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_378_74# a_208_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND TE_B a_208_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND a_208_74# a_378_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_378_74# a_27_368# Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Z a_27_368# a_348_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 Z a_27_368# a_378_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_378_74# a_27_368# Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.cdl b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.cdl
index 871fefe..bd53c79 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.cdl
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__ebufn_8 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z net35 VNB nshort m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net35 VNB nfet_01v8 m=8 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
-MMN1 sndA net39 VNB nshort m=8 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
-MMIN1 net39 TE_B 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 net35 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
-MMP0 VPWR TE_B VPB phighvt m=8 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
-MMP1 sndTEB net35 VPB phighvt m=8 w=1.12 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 VNB nfet_01v8 m=8 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
-MMIP1 net39 TE_B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMIN1 net39 TE_B 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
-MI5 net35 A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net35 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
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=8 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
+MMP1 sndTEB net35 VPB pfet_01v8_hvt m=8 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 net39 TE_B VPB 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
+MI5 net35 A VPB 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
 .ENDS sky130_fd_sc_ls__ebufn_8
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.netlist.tsv b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.netlist.tsv
index 6b5d32e..b4c2433 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__ebufn_8	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	net35	sndA	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net35	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net35	Z	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	A	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net35	sndA	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net35	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net35	Z	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.spice b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.spice
index f8228b7..c44bd95 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.spice
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ls__ebufn_8 A TE_B VGND VNB VPB VPWR Z
-M1000 VGND a_833_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=1.2506e+12p pd=1.226e+07u as=2.0054e+12p ps=1.874e+07u
-M1001 a_27_74# a_833_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR TE_B a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.6421e+12p pd=1.841e+07u as=3.0856e+12p ps=2.567e+07u
-M1003 a_28_368# a_84_48# Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.4392e+12p ps=1.153e+07u
-M1004 VPWR TE_B a_833_48# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=5.712e+11p ps=3.26e+06u
-M1005 VPWR A a_84_48# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1006 a_27_74# a_84_48# Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=9.213e+11p ps=8.41e+06u
-M1007 VPWR TE_B a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_84_48# A VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1009 Z a_84_48# a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z a_84_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_28_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# a_84_48# Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_833_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR TE_B a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_84_48# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_28_368# a_84_48# Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A a_84_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_28_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Z a_84_48# a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_28_368# a_84_48# Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_833_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z a_84_48# a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_833_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Z a_84_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR TE_B a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Z a_84_48# a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_28_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND TE_B a_833_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1029 Z a_84_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_74# a_84_48# Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z a_84_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_74# a_833_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_28_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_74# a_84_48# Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_27_74# a_833_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_28_368# a_84_48# Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_74# a_833_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_28_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND a_833_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_84_48# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_833_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR A a_84_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_28_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_28_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR TE_B a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_28_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_27_74# a_833_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 Z a_84_48# a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_84_48# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND a_833_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_28_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VPWR TE_B a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_28_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 Z a_84_48# a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_28_368# a_84_48# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_27_74# a_833_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_833_48# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VPWR TE_B a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VGND A a_84_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 Z a_84_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 Z a_84_48# a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 a_27_74# a_833_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 a_27_74# a_833_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 VGND a_833_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 Z a_84_48# a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 a_27_74# a_84_48# Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 a_28_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 VPWR TE_B a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 a_833_48# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.cdl b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.cdl
index 7b3851b..0f21c7e 100644
--- a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.cdl
+++ b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_ls__edfxbp_1 CLK D DE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI14 net123 M1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI14 net123 M1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 net63 deneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI637 clkpos clkneg VPB 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
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB 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
-MI658 net108 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI655 net63 deneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net91 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N S1 VPB 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
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net80 DE VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 S1 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 db S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 deneg DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 Q S0 VPB 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
+MI658 net108 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB 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
+MI643 net91 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N S1 VPB 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
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net80 DE VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 db S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net188 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net143 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI635 clkneg CLK 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
+MI661 Q_N S1 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI641 net188 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net143 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 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
-MI646 Q S0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net163 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 S1 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net163 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net156 M1 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
+MI15 S0 clkpos 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
+MI5 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 S1 S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 db S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net156 M1 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
-MI15 S0 clkpos 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
-MI5 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 db S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net136 deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI12 net136 deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__edfxbp_1
diff --git a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.netlist.tsv b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.netlist.tsv
index fb0d978..c13a125 100644
--- a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.netlist.tsv
+++ b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_ls__edfxbp_1	CLK:I D:I DE: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
-MI14	MOSFET	net123	M1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net123	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	net63	deneg	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net108	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net91	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net91	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	S1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net108	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net80	DE	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	db	S1	net80	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	db	D	net63	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net188	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net188	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net143	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net163	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net163	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	S1	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net156	M1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net156	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	db	D	net143	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	db	S1	net136	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net136	deneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net123	M1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net123	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	net63	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net108	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net91	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net91	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	S1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net108	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net80	DE	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	db	S1	net80	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	db	D	net63	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net188	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net188	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net143	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net163	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net163	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net156	M1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net156	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	db	D	net143	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	db	S1	net136	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net136	deneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.spice b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.spice
index fad5d78..81f09f4 100644
--- a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.spice
+++ b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ls__edfxbp_1 CLK D DE VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_575_48# a_2206_443# VPB phighvt w=420000u l=150000u
-+  ad=2.56525e+12p pd=2.156e+07u as=1.386e+11p ps=1.5e+06u
-M1001 a_1423_508# a_818_74# a_1198_97# VPB phighvt w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=1.26e+11p ps=1.44e+06u
-M1002 a_1807_74# a_1419_71# VGND VNB nshort w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=1.908e+12p ps=1.641e+07u
-M1003 a_1008_74# a_818_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1004 VPWR a_1419_71# a_1423_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_2008_392# a_1419_71# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1006 a_1879_74# a_1008_74# a_1807_74# VNB nshort w=740000u l=150000u
-+  ad=7.478e+11p pd=4.66e+06u as=0p ps=0u
-M1007 a_27_74# a_575_48# a_556_504# VPB phighvt w=420000u l=150000u
-+  ad=4.538e+11p pd=4.78e+06u as=1.008e+11p ps=1.32e+06u
-M1008 a_818_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1009 VGND a_575_48# a_2227_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 a_1198_97# a_1008_74# a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_1879_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1012 a_1334_97# a_1008_74# a_1198_97# VNB nshort w=420000u l=150000u
-+  ad=1.785e+11p pd=1.69e+06u as=2.226e+11p ps=1.9e+06u
-M1013 a_1419_71# a_1198_97# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1014 a_575_48# a_1879_74# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1015 VGND a_1879_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1016 a_1419_71# a_1198_97# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1017 VGND DE a_145_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1018 a_2206_443# a_1008_74# a_1879_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.475e+11p ps=2.84e+06u
-M1019 VGND a_1419_71# a_1334_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Q_N a_575_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1021 a_1879_74# a_818_74# a_2008_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Q_N a_575_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1023 a_575_48# a_1879_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1024 a_116_508# D a_27_74# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1025 a_2227_118# a_818_74# a_1879_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND DE a_161_446# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.281e+11p ps=1.45e+06u
-M1027 a_818_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1028 a_1008_74# a_818_74# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1029 VPWR a_161_446# a_116_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_556_504# DE VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_145_74# D a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.158e+11p ps=4.5e+06u
-M1032 VPWR DE a_161_446# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1033 a_1198_97# a_818_74# a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_527_74# a_161_446# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1035 a_27_74# a_575_48# a_527_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR DE a_556_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR CLK a_818_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_1198_97# a_818_74# a_1423_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_27_74# a_1008_74# a_1198_97# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND a_1198_97# a_1419_71# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_1807_74# a_1008_74# a_1879_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND a_575_48# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND a_818_74# a_1008_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Q a_1879_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_161_446# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 VPWR a_1879_74# a_575_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_27_74# a_818_74# a_1198_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_1879_74# a_575_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_116_508# a_161_446# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_1423_508# a_1419_71# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_527_74# a_575_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_1419_71# a_1807_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_556_504# a_575_48# a_27_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 VPWR a_818_74# a_1008_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VGND CLK a_818_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VPWR a_575_48# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 VPWR a_1198_97# a_1419_71# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 a_161_446# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_1879_74# a_1008_74# a_2206_443# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_2206_443# a_575_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_1879_74# a_818_74# a_2227_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND a_161_446# a_527_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_27_74# D a_116_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_27_74# D a_145_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_1419_71# a_2008_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X30 a_2008_392# a_818_74# a_1879_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X31 a_145_74# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1198_97# a_1008_74# a_1334_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1334_97# a_1419_71# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 Q a_1879_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 a_2227_118# a_575_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.cdl b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.cdl
index 45378d4..304d99a 100644
--- a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.cdl
+++ b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_ls__edfxtp_1 CLK D DE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I DE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI14 net115 M1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI14 net115 M1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 net59 deneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI637 clkpos clkneg VPB 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
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB 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
-MI658 net79 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI655 net59 deneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net83 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net76 DE VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 S1 S0 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 db S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 deneg DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 Q S0 VPB 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
+MI658 net79 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB 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
+MI643 net83 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net76 DE VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 S1 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 db S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net175 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 db D VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net172 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI635 clkneg CLK 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
+MI641 net175 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net172 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net160 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net148 M1 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
+MI15 S0 clkpos 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
+MI5 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net160 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 db S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net148 M1 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
-MI15 S0 clkpos 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
-MI5 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 db S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net128 deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI12 net128 deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__edfxtp_1
diff --git a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.netlist.tsv b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.netlist.tsv
index b4bd126..953aa60 100644
--- a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.netlist.tsv
+++ b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_ls__edfxtp_1	CLK:I D:I DE: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
-MI14	MOSFET	net115	M1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net115	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	net59	deneg	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net79	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net83	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net83	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net79	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net76	DE	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	db	S1	net76	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	db	D	net59	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net175	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net175	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net172	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net160	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net160	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net148	M1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net148	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	db	D	net172	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	db	S1	net128	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net128	deneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net115	M1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net115	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	net59	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net79	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net83	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net83	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net79	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net76	DE	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	db	S1	net76	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	db	D	net59	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net175	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net175	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net172	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net160	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net160	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net148	M1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net148	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	db	D	net172	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	db	S1	net128	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net128	deneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.spice b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.spice
index 099d16d..070da53 100644
--- a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.spice
+++ b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__edfxtp_1 CLK D DE VGND VNB VPB VPWR Q
-M1000 VGND a_533_61# a_1997_74# VNB nshort w=420000u l=150000u
-+  ad=1.8056e+12p pd=1.622e+07u as=1.008e+11p ps=1.32e+06u
-M1001 a_1156_90# a_958_74# a_27_508# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=3.528e+11p ps=4.2e+06u
-M1002 a_533_61# a_1895_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_1409_64# a_1156_90# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1004 VGND DE a_131_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 a_1794_392# a_1409_64# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=7.85e+11p pd=3.57e+06u as=2.22792e+12p ps=1.982e+07u
-M1006 a_1997_74# a_763_74# a_1895_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.424e+11p ps=2.2e+06u
-M1007 a_131_74# D a_27_508# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=4.23e+06u
-M1008 VGND DE a_159_446# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1009 a_958_74# a_763_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1010 a_27_508# a_533_61# a_554_436# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 a_1382_508# a_763_74# a_1156_90# VPB phighvt w=420000u l=150000u
-+  ad=1.491e+11p pd=1.55e+06u as=0p ps=0u
-M1012 a_763_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.035e+11p pd=2.03e+06u as=0p ps=0u
-M1013 a_1797_74# a_1409_64# VGND VNB nshort w=740000u l=150000u
-+  ad=2.516e+11p pd=2.16e+06u as=0p ps=0u
-M1014 VPWR a_1409_64# a_1382_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1409_64# a_1156_90# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1016 VPWR a_533_61# a_2088_502# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1017 a_533_61# a_1895_74# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=0p ps=0u
-M1018 VGND a_1895_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1019 a_491_87# a_159_446# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 VPWR a_1895_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1021 a_27_508# a_533_61# a_491_87# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1156_90# a_763_74# a_27_508# VNB nshort w=420000u l=150000u
-+  ad=3.423e+11p pd=2.47e+06u as=0p ps=0u
-M1023 a_2088_502# a_958_74# a_1895_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.328e+11p ps=2.77e+06u
-M1024 a_114_508# D a_27_508# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1025 a_1895_74# a_763_74# a_1794_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1349_90# a_958_74# a_1156_90# VNB nshort w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1027 a_554_436# DE VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1895_74# a_958_74# a_1797_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_763_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1030 VPWR a_159_446# a_114_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR DE a_159_446# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1032 a_958_74# a_763_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1033 VGND a_1409_64# a_1349_90# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1895_74# a_763_74# a_1997_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND CLK a_763_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_1997_74# a_533_61# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1382_508# a_1409_64# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND a_763_74# a_958_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_508# D a_131_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_508# a_763_74# a_1156_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_114_508# a_159_446# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR CLK a_763_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_159_446# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_159_446# a_491_87# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR DE a_554_436# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VPWR a_1895_74# a_533_61# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VPWR a_1409_64# a_1794_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_27_508# a_958_74# a_1156_90# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR a_1156_90# a_1409_64# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_131_74# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_1409_64# a_1797_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 Q a_1895_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_159_446# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_1895_74# a_958_74# a_2088_502# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_1349_90# a_1409_64# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 Q a_1895_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_27_508# D a_114_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 VGND a_1895_74# a_533_61# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_1156_90# a_1409_64# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 VPWR a_763_74# a_958_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_1156_90# a_958_74# a_1349_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1156_90# a_763_74# a_1382_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_2088_502# a_533_61# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_554_436# a_533_61# a_27_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_1797_74# a_958_74# a_1895_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_491_87# a_533_61# a_27_508# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1794_392# a_763_74# a_1895_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_1.cdl b/cells/einvn/sky130_fd_sc_ls__einvn_1.cdl
index 3a702e5..7ec72bb 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_1.cdl
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__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 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
-MMN1 sndA net25 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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
-MMIN1 net25 TE_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB 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
-MMP1 sndTEB A VPB 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 net25 TE_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMN1 sndA net25 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
+MMIN1 net25 TE_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=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
+MMP1 sndTEB A VPB 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
+MMIP1 net25 TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_1.netlist.tsv b/cells/einvn/sky130_fd_sc_ls__einvn_1.netlist.tsv
index 8c8217c..db9595d 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_1.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net25	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net25	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net25	TE_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net25	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net25	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net25	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_1.spice b/cells/einvn/sky130_fd_sc_ls__einvn_1.spice
index 253c37e..6576013 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_1.spice
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__einvn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 a_281_100# a_22_46# VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.564e+11p ps=2.36e+06u
-M1001 Z A a_278_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=3.024e+11p ps=2.78e+06u
-M1002 Z A a_281_100# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 a_278_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.88e+11p ps=3.01e+06u
-M1004 VGND TE_B a_22_46# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1005 VPWR TE_B a_22_46# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
+X0 VGND a_22_46# a_281_100# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_22_46# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_22_46# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR TE_B a_278_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_281_100# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_278_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_2.cdl b/cells/einvn/sky130_fd_sc_ls__einvn_2.cdl
index c00da20..19e29ba 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_2.cdl
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__einvn_2 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB 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
-MMN1 sndA TE VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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
-MMIN1 TE TE_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE 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
-MMP0 VPWR TE_B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TE TE_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB 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
-MMIP1 TE TE_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB 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
+MMP1 sndTEB A VPB 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
+MMIP1 TE TE_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__einvn_2
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_2.netlist.tsv b/cells/einvn/sky130_fd_sc_ls__einvn_2.netlist.tsv
index 263bb12..d1c2a34 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_2.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__einvn_2	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	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TE	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_2.spice b/cells/einvn/sky130_fd_sc_ls__einvn_2.spice
index 9456ffa..e13bb77 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_2.spice
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__einvn_2 A TE_B VGND VNB VPB VPWR Z
-M1000 a_227_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.968e+11p pd=8.5e+06u as=5.216e+11p ps=4.7e+06u
-M1001 VGND a_115_464# a_231_74# VNB nshort w=740000u l=150000u
-+  ad=3.269e+11p pd=3.45e+06u as=6.176e+11p ps=6.17e+06u
-M1002 a_231_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1003 Z A a_227_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1004 a_231_74# a_115_464# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_227_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_115_464# TE_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1007 VPWR TE_B a_227_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_231_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_115_464# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 Z A a_227_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR TE_B a_227_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_231_74# a_115_464# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND a_115_464# a_231_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR TE_B a_115_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_231_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Z A a_231_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_227_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_227_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND TE_B a_115_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_4.cdl b/cells/einvn/sky130_fd_sc_ls__einvn_4.cdl
index 63360c6..beb91b2 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_4.cdl
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__einvn_4 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB 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
-MMN1 sndA TE VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A 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
-MMIN1 TE TE_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE 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
-MMP0 VPWR TE_B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TE TE_B 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
-MMP1 sndTEB A VPB phighvt 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
-MMIP1 TE TE_B VPB 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
+MMP0 VPWR TE_B VPB 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
+MMP1 sndTEB A VPB 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
+MMIP1 TE TE_B VPB 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
 .ENDS sky130_fd_sc_ls__einvn_4
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_4.netlist.tsv b/cells/einvn/sky130_fd_sc_ls__einvn_4.netlist.tsv
index e6f61d5..5d009ec 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_4.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__einvn_4	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	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TE	TE_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_4.spice b/cells/einvn/sky130_fd_sc_ls__einvn_4.spice
index 308395c..14a627e 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_4.spice
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__einvn_4 A TE_B VGND VNB VPB VPWR Z
-M1000 a_281_74# A Z VNB nshort w=740000u l=150000u
-+  ad=1.0508e+12p pd=1.024e+07u as=4.144e+11p ps=4.08e+06u
-M1001 Z A a_241_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.6688e+12p ps=1.418e+07u
-M1002 a_281_74# a_114_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=6.253e+11p ps=6.13e+06u
-M1003 VGND a_114_74# a_281_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_281_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_241_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_114_74# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=1.0584e+12p ps=8.61e+06u
-M1007 a_241_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_281_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_281_74# a_114_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z A a_241_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR TE_B a_241_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR TE_B a_241_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_114_74# TE_B VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1014 a_241_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Z A a_281_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_114_74# a_281_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_241_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Z A a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_281_74# a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 Z A a_281_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Z A a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR TE_B a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR TE_B a_114_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR TE_B a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_281_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Z A a_281_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_241_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_241_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_241_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND a_114_74# a_281_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_281_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND TE_B a_114_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_281_74# a_114_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_241_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND a_114_74# a_281_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_8.cdl b/cells/einvn/sky130_fd_sc_ls__einvn_8.cdl
index 00c7fdd..9ed77af 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_8.cdl
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__einvn_8 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=8 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
-MMN1 sndA TE VNB nshort m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=8 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
-MMIN1 TE TE_B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=8 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
-MMP0 VPWR TE_B VPB phighvt m=8 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TE TE_B 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
-MMP1 sndTEB A VPB phighvt m=8 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 TE TE_B VPB 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
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=8 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
+MMP1 sndTEB A VPB pfet_01v8_hvt m=8 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 TE TE_B VPB 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
 .ENDS sky130_fd_sc_ls__einvn_8
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_8.netlist.tsv b/cells/einvn/sky130_fd_sc_ls__einvn_8.netlist.tsv
index 980e4fe..446fa9e 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_8.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__einvn_8	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	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TE	TE_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_8.spice b/cells/einvn/sky130_fd_sc_ls__einvn_8.spice
index 953a6c0..c382aae 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_8.spice
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__einvn_8 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_239_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.0104e+12p pd=1.479e+07u as=3.0128e+12p ps=2.554e+07u
-M1001 Z A a_239_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4e+12p pd=1.146e+07u as=0p ps=0u
-M1002 a_239_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_126_74# a_293_74# VNB nshort w=740000u l=150000u
-+  ad=1.1433e+12p pd=1.049e+07u as=1.924e+12p ps=1.852e+07u
-M1004 Z A a_293_74# VNB nshort w=740000u l=150000u
-+  ad=9.324e+11p pd=8.44e+06u as=0p ps=0u
-M1005 VGND a_126_74# a_293_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Z A a_239_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z A a_293_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_239_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_239_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z A a_293_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_239_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR TE_B a_239_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z A a_293_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z A a_239_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_293_74# a_126_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_126_74# a_293_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_293_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR TE_B a_239_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_126_74# a_293_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_126_74# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1021 Z A a_239_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_293_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_239_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_293_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_239_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_293_74# a_126_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_239_368# TE_B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_239_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_293_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_293_74# a_126_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR TE_B a_239_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_126_74# TE_B VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1033 a_293_74# a_126_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Z A a_239_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_239_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_293_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND TE_B a_126_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND a_126_74# a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_293_74# a_126_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_293_74# a_126_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_293_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR TE_B a_126_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR TE_B a_239_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_293_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Z A a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Z A a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_239_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Z A a_239_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_293_74# a_126_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_239_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND a_126_74# a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_239_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_293_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VPWR TE_B a_239_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 Z A a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 Z A a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_239_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_239_368# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VPWR TE_B a_239_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_239_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 Z A a_239_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 VGND a_126_74# a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 a_239_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 VPWR TE_B a_239_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_293_74# a_126_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 VGND a_126_74# a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 Z A a_239_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_1.cdl b/cells/einvp/sky130_fd_sc_ls__einvp_1.cdl
index 6fac7f9..fde2540 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_1.cdl
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__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 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
-MMN1 sndA TE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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
-MMIN1 TEB TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE 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
-MMP0 VPWR TEB VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TEB VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_1.netlist.tsv b/cells/einvp/sky130_fd_sc_ls__einvp_1.netlist.tsv
index 9d26116..9acbad3 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_1.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_1.spice b/cells/einvp/sky130_fd_sc_ls__einvp_1.spice
index bb8847a..d994d6e 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_1.spice
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__einvp_1 A TE VGND VNB VPB VPWR Z
-M1000 VPWR TE a_44_549# VPB phighvt w=420000u l=150000u
-+  ad=3.328e+11p pd=2.77e+06u as=2.646e+11p ps=2.1e+06u
-M1001 a_318_74# TE VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.276e+11p ps=2.16e+06u
-M1002 Z A a_318_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 VGND TE a_44_549# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.604e+11p ps=2.08e+06u
-M1004 Z A a_310_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=2.7e+11p ps=2.54e+06u
-M1005 a_310_392# a_44_549# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND TE a_318_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_310_392# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VPWR a_44_549# a_310_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_44_549# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_44_549# TE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_318_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_2.cdl b/cells/einvp/sky130_fd_sc_ls__einvp_2.cdl
index 6a941fa..4cefb0e 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_2.cdl
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__einvp_2 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB 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
-MMN1 sndA TE VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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
-MMIN1 TEB TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE 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
-MMP0 VPWR TEB VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB 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
-MMIP1 TEB TE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TEB VPB 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
+MMP1 sndTEB A VPB 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
+MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__einvp_2
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_2.netlist.tsv b/cells/einvp/sky130_fd_sc_ls__einvp_2.netlist.tsv
index 1b7c63a..85dac46 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_2.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__einvp_2	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	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_2.spice b/cells/einvp/sky130_fd_sc_ls__einvp_2.spice
index ba0def4..e834339 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_2.spice
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__einvp_2 A TE VGND VNB VPB VPWR Z
-M1000 a_27_368# a_263_323# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.912e+11p pd=8.49e+06u as=5.248e+11p ps=4.71e+06u
-M1001 a_36_74# A Z VNB nshort w=740000u l=150000u
-+  ad=6.29e+11p pd=6.14e+06u as=2.072e+11p ps=2.04e+06u
-M1002 VPWR TE a_263_323# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.856e+11p ps=1.86e+06u
-M1003 VGND TE a_36_74# VNB nshort w=740000u l=150000u
-+  ad=3.332e+11p pd=3.48e+06u as=0p ps=0u
-M1004 Z A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1005 a_27_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_263_323# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_36_74# TE VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_36_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND TE a_263_323# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_263_323# TE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_263_323# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_27_368# a_263_323# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Z A a_36_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_36_74# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND TE a_36_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_263_323# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_36_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_4.cdl b/cells/einvp/sky130_fd_sc_ls__einvp_4.cdl
index b79cae7..d27a5fd 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_4.cdl
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__einvp_4 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB 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
-MMN1 sndA TE VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A 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
-MMIN1 TEB TE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE 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
-MMP0 VPWR TEB VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TEB TE 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
-MMP1 sndTEB A VPB phighvt 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
-MMIP1 TEB TE VPB 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
+MMP0 VPWR TEB VPB 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
+MMP1 sndTEB A VPB 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
+MMIP1 TEB TE VPB 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
 .ENDS sky130_fd_sc_ls__einvp_4
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_4.netlist.tsv b/cells/einvp/sky130_fd_sc_ls__einvp_4.netlist.tsv
index 97e10c4..0f7d046 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_4.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__einvp_4	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	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_4.spice b/cells/einvp/sky130_fd_sc_ls__einvp_4.spice
index 78195d0..7f46822 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_4.spice
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__einvp_4 A TE VGND VNB VPB VPWR Z
-M1000 a_27_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.7864e+12p pd=1.439e+07u as=7.224e+11p ps=5.77e+06u
-M1001 VGND TE a_27_74# VNB nshort w=740000u l=150000u
-+  ad=8.843e+11p pd=6.83e+06u as=1.1655e+12p ps=1.055e+07u
-M1002 a_27_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.995e+11p ps=4.31e+06u
-M1003 VPWR a_473_323# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0696e+12p pd=8.63e+06u as=0p ps=0u
-M1004 VPWR TE a_473_323# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1005 a_27_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_74# TE VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_368# a_473_323# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# TE VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_473_323# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_368# a_473_323# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND TE a_473_323# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1016 Z A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND TE a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_368# a_473_323# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_473_323# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_473_323# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_27_368# a_473_323# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR a_473_323# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR a_473_323# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_8.cdl b/cells/einvp/sky130_fd_sc_ls__einvp_8.cdl
index 933375c..7ffe2d3 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_8.cdl
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__einvp_8 A TE VGND VNB VPB VPWR Z
 *.PININFO A:I TE:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MMN0 Z A VNB nshort m=8 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
-MMN1 sndA TE VNB nshort m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=8 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
-MMIN1 TEB TE VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=8 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
-MMP0 VPWR TEB VPB phighvt m=8 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TEB TE 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
-MMP1 sndTEB A VPB phighvt m=8 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 TEB TE VPB 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
+MMP0 VPWR TEB VPB pfet_01v8_hvt m=8 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
+MMP1 sndTEB A VPB pfet_01v8_hvt m=8 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 TEB TE VPB 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
 .ENDS sky130_fd_sc_ls__einvp_8
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_8.netlist.tsv b/cells/einvp/sky130_fd_sc_ls__einvp_8.netlist.tsv
index c04727c..aa5afa6 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_8.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__einvp_8	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	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_8.spice b/cells/einvp/sky130_fd_sc_ls__einvp_8.spice
index 9cb9cd9..4015a1d 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_8.spice
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__einvp_8 A TE VGND VNB VPB VPWR Z
-M1000 a_27_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.0016e+12p pd=2.552e+07u as=1.344e+12p ps=1.136e+07u
-M1001 a_27_368# a_802_323# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.6632e+12p ps=1.417e+07u
-M1002 VPWR a_802_323# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_74# TE VGND VNB nshort w=740000u l=150000u
-+  ad=2.0276e+12p pd=1.88e+07u as=1.1433e+12p ps=1.049e+07u
-M1005 a_27_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=9.842e+11p ps=8.58e+06u
-M1006 VPWR a_802_323# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_802_323# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# a_802_323# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_368# a_802_323# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# TE VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR TE a_802_323# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.192e+11p ps=2.81e+06u
-M1014 a_27_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND TE a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Z A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# TE VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_802_323# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Z A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_368# A Z VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_74# TE VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Z A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Z A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_74# A Z VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_368# a_802_323# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND TE a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND TE a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND TE a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND TE a_802_323# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.146e+11p ps=2.06e+06u
+X0 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_802_323# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR a_802_323# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_27_368# a_802_323# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR a_802_323# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_27_368# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VPWR a_802_323# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND TE a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_802_323# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 Z A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_27_74# A Z VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 VPWR a_802_323# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_27_368# a_802_323# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 Z A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_27_74# TE VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_27_368# a_802_323# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 a_27_368# a_802_323# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_ls__fa_1.cdl b/cells/fa/sky130_fd_sc_ls__fa_1.cdl
index 8ed2a3f..048b16d 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_1.cdl
+++ b/cells/fa/sky130_fd_sc_ls__fa_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ls__fa_1 A B CIN VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMNs1s nint1 majb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 COUT majb 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
-MMIN3 SUM sumb 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
-MMNmaj10 majb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj11 sndNAp1 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb 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
-MMNmaj30 majb CIN VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb 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
-MMNmaj31 sndNCINn3 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj20 VGND A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s0 VGND A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s0 nint1 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s1 nint1 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs3s2 nint1 CIN VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNmaj31 sndNCINn3 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB 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
-MMIP3 SUM sumb VPB 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
-MMPmaj10 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj11 sndPAp1 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj20 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj21 sndPCINp3 CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s0 VGND A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj31 sndPCINp3 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s1 sndNAn4 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s1 sndPAp4 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s0 nint1 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s0 pint1 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s1 pint1 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s2 pint1 CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s1 nint1 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs1s pint1 majb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s2 nint1 CIN VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB 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
+MMIP3 SUM sumb VPB 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
+MMPmaj10 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj11 sndPAp1 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj20 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj21 sndPCINp3 CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj31 sndPCINp3 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s1 sndPAp4 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s2 sndPBp4 CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s0 pint1 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s1 pint1 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s2 pint1 CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1s pint1 majb VPB pfet_01v8_hvt m=1 w=1.0 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_ls__fa_1
diff --git a/cells/fa/sky130_fd_sc_ls__fa_1.netlist.tsv b/cells/fa/sky130_fd_sc_ls__fa_1.netlist.tsv
index faf6771..e83bffd 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_1.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_ls__fa_1.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ls__fa_1	A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fa/sky130_fd_sc_ls__fa_1.spice b/cells/fa/sky130_fd_sc_ls__fa_1.spice
index f7cd605..a5af984 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_1.spice
+++ b/cells/fa/sky130_fd_sc_ls__fa_1.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__fa_1 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_69_260# CIN a_318_389# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=3.9175e+11p ps=3.13e+06u
-M1001 a_1107_347# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=7.8e+11p pd=5.56e+06u as=2.2238e+12p ps=1.522e+07u
-M1002 VGND CIN a_501_75# VNB nshort w=640000u l=150000u
-+  ad=1.65875e+12p pd=1.244e+07u as=4.096e+11p ps=3.84e+06u
-M1003 a_509_347# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.9e+11p pd=5.38e+06u as=0p ps=0u
-M1004 a_501_75# a_465_249# a_69_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.496e+11p ps=2.06e+06u
-M1005 a_318_389# B a_217_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.73375e+11p ps=2.92e+06u
-M1006 a_509_347# a_465_249# a_69_260# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR CIN a_509_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_237_75# A VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1009 a_916_347# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.55e+11p pd=2.71e+06u as=0p ps=0u
-M1010 a_465_249# B a_916_347# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1011 a_217_368# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B a_501_75# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1100_75# B VGND VNB nshort w=640000u l=150000u
-+  ad=8.888e+11p pd=5.27e+06u as=0p ps=0u
-M1014 a_1107_347# CIN a_465_249# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_501_75# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_465_249# B a_936_75# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=1.536e+11p ps=1.76e+06u
-M1017 COUT a_465_249# VGND VNB nshort w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1018 VGND A a_1100_75# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B a_509_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1100_75# CIN a_465_249# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_69_260# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.192e+11p ps=2.81e+06u
-M1022 VPWR A a_1107_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 COUT a_465_249# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1024 VGND a_69_260# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1025 a_315_75# B a_237_75# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1026 a_69_260# CIN a_315_75# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_936_75# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_916_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_318_389# CIN a_69_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_217_368# B a_318_389# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_1107_347# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR A a_509_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VPWR a_465_249# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_916_347# B a_465_249# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_465_249# CIN a_1100_75# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_315_75# CIN a_69_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VGND A a_501_75# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 SUM a_69_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_69_260# a_465_249# a_501_75# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_465_249# CIN a_1107_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 VPWR B a_1107_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_69_260# a_465_249# a_509_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_509_347# CIN VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_501_75# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_509_347# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 VGND A a_237_75# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VGND A a_936_75# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 VPWR A a_217_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_501_75# CIN VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_237_75# B a_315_75# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_936_75# B a_465_249# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 SUM a_69_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VGND B a_1100_75# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 a_1100_75# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VGND a_465_249# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_ls__fa_2.cdl b/cells/fa/sky130_fd_sc_ls__fa_2.cdl
index dc73225..00c9388 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_2.cdl
+++ b/cells/fa/sky130_fd_sc_ls__fa_2.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ls__fa_2 A B CIN VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMNs1s nint1 majb VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb 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
-MMIN2 COUT majb 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
-MMIN3 SUM sumb 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
-MMNmaj10 majb B 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
-MMNmaj11 sndNAp1 A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb 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
-MMNmaj30 majb CIN VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb 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
-MMNmaj21 nmajmid A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb B 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
-MMNmaj20 VGND B 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
-MMNs2s0 VGND 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
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 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
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN 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
-MMNs3s0 nint1 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
-MMNs3s1 nint1 B 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
-MMNs3s2 nint1 CIN VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj21 nmajmid 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
-MMIP2 COUT majb VPB 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
-MMIP3 SUM sumb VPB 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
-MMPmaj10 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj11 sndPAp1 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND B 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
-MMPmaj20 VPWR B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj30 pmajmid CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s0 VGND 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
-MMPmaj21 pmajmid A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s1 sndNAn4 B 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
-MMPs2s0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s1 sndPAp4 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN 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
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s0 nint1 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
-MMPs3s0 pint1 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s1 pint1 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s2 pint1 CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s1 nint1 B 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
-MMPs1s pint1 majb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s2 nint1 CIN 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
+MMIP2 COUT majb VPB 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
+MMIP3 SUM sumb VPB 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
+MMPmaj10 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj11 sndPAp1 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj20 VPWR B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj30 pmajmid CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj21 pmajmid A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s1 sndPAp4 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s2 sndPBp4 CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s0 pint1 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s1 pint1 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s2 pint1 CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1s pint1 majb VPB pfet_01v8_hvt m=1 w=1.0 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_ls__fa_2
diff --git a/cells/fa/sky130_fd_sc_ls__fa_2.netlist.tsv b/cells/fa/sky130_fd_sc_ls__fa_2.netlist.tsv
index 2394da2..f92111e 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_2.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_ls__fa_2.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ls__fa_2	A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fa/sky130_fd_sc_ls__fa_2.spice b/cells/fa/sky130_fd_sc_ls__fa_2.spice
index 5450b92..ac1cbdf 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_2.spice
+++ b/cells/fa/sky130_fd_sc_ls__fa_2.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__fa_2 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_1205_79# B a_1119_79# VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.072e+11p ps=2.04e+06u
-M1001 VGND A a_1205_79# VNB nshort w=740000u l=150000u
-+  ad=2.36723e+12p pd=1.592e+07u as=0p ps=0u
-M1002 COUT a_336_347# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 a_27_79# B VGND VNB nshort w=740000u l=150000u
-+  ad=6.327e+11p pd=4.67e+06u as=0p ps=0u
-M1004 SUM a_992_347# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 a_27_378# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.95e+11p pd=5.19e+06u as=2.80985e+12p ps=1.858e+07u
-M1006 a_683_347# CIN VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.82125e+11p pd=5.62e+06u as=0p ps=0u
-M1007 VPWR A a_27_378# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_336_347# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 COUT a_336_347# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.424e+11p pd=3.03e+06u as=0p ps=0u
-M1010 VGND a_992_347# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_701_79# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=5.18e+11p ps=4.36e+06u
-M1012 a_336_347# CIN a_27_378# VPB phighvt w=1e+06u l=150000u
-+  ad=5.9e+11p pd=3.18e+06u as=0p ps=0u
-M1013 a_701_79# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 SUM a_992_347# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1015 VGND A a_27_79# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_484_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1017 a_1119_79# CIN a_992_347# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.59e+11p ps=2.18e+06u
-M1018 a_683_347# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A a_487_79# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1020 VPWR A a_1202_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1021 a_487_79# B a_336_347# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.59e+11p ps=2.18e+06u
-M1022 a_484_347# B a_336_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B a_683_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_992_347# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1094_347# CIN a_992_347# VPB phighvt w=1e+06u l=150000u
-+  ad=4.047e+11p pd=2.99e+06u as=3.6e+11p ps=2.72e+06u
-M1026 a_1202_368# B a_1094_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_336_347# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_336_347# CIN a_27_79# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_701_79# CIN VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_992_347# a_336_347# a_683_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_992_347# a_336_347# a_701_79# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_683_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND a_992_347# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_1205_79# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 SUM a_992_347# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR CIN a_683_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND a_336_347# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_701_79# a_336_347# a_992_347# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 COUT a_336_347# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_378# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_683_347# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 VPWR B a_27_378# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_27_79# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_79# CIN a_336_347# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR a_992_347# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_992_347# CIN a_1119_79# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_1119_79# B a_1205_79# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_1202_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_683_347# a_336_347# a_992_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 VGND B a_27_79# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_992_347# CIN a_1094_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 a_484_347# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_487_79# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_1094_347# B a_1202_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 COUT a_336_347# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VGND CIN a_701_79# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_27_378# CIN a_336_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 a_336_347# B a_484_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 SUM a_992_347# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 VGND A a_701_79# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VPWR a_336_347# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_336_347# B a_487_79# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_701_79# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_ls__fa_4.cdl b/cells/fa/sky130_fd_sc_ls__fa_4.cdl
index 21d453c..d155741 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_4.cdl
+++ b/cells/fa/sky130_fd_sc_ls__fa_4.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_ls__fa_4 A B CIN VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMNs1s nint1 majb VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb 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
-MMIN2 COUT majb 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
-MMIN3 SUM sumb 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
-MMNmaj10 majb B 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
-MMNmaj11 sndNAp1 A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb 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
-MMNmaj30 majb CIN VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb 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
-MMNmaj21 nmajmid A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb B 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
-MMNmaj20 VGND B 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
-MMNs2s0 VGND 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
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 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
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN 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
-MMNs3s0 nint1 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
-MMNs3s1 nint1 B 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
-MMNs3s2 nint1 CIN VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNmaj21 nmajmid 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
-MMIP2 COUT majb VPB phighvt 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
-MMIP3 SUM sumb VPB phighvt 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
-MMPmaj10 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj11 sndPAp1 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND B 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
-MMPmaj20 VPWR B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPmaj30 pmajmid CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s0 VGND 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
-MMPmaj21 pmajmid A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s1 sndNAn4 B 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
-MMPs2s0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs2s1 sndPAp4 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN 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
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s0 nint1 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
-MMPs3s0 pint1 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s1 pint1 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs3s2 pint1 CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s1 nint1 B 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
-MMPs1s pint1 majb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNs3s2 nint1 CIN 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
+MMIP2 COUT majb VPB 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
+MMIP3 SUM sumb VPB 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
+MMPmaj10 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj11 sndPAp1 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj20 VPWR B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj30 pmajmid CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPmaj21 pmajmid A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s1 sndPAp4 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs2s2 sndPBp4 CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s0 pint1 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s1 pint1 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs3s2 pint1 CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1s pint1 majb VPB pfet_01v8_hvt m=1 w=1.0 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_ls__fa_4
diff --git a/cells/fa/sky130_fd_sc_ls__fa_4.netlist.tsv b/cells/fa/sky130_fd_sc_ls__fa_4.netlist.tsv
index 20c8549..36e9fe3 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_4.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_ls__fa_4.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_ls__fa_4	A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fa/sky130_fd_sc_ls__fa_4.spice b/cells/fa/sky130_fd_sc_ls__fa_4.spice
index 0d40f8a..2da410f 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_4.spice
+++ b/cells/fa/sky130_fd_sc_ls__fa_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__fa_4 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_535_347# B a_418_74# VPB phighvt w=1e+06u l=150000u
-+  ad=3.6e+11p pd=2.72e+06u as=3e+11p ps=2.6e+06u
-M1001 VPWR A a_535_347# VPB phighvt w=1e+06u l=150000u
-+  ad=3.21355e+12p pd=2.367e+07u as=0p ps=0u
-M1002 SUM a_1024_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1003 VPWR B a_737_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6.5e+11p ps=5.3e+06u
-M1004 a_737_347# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_737_347# CIN VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1024_74# a_418_74# a_737_347# VPB phighvt w=1e+06u l=150000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
-M1007 VPWR a_1024_74# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_418_74# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1009 VPWR a_418_74# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_392# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=1.27633e+12p pd=6.69e+06u as=0p ps=0u
-M1011 a_1235_347# B a_1141_347# VPB phighvt w=1e+06u l=150000u
-+  ad=4.047e+11p pd=2.99e+06u as=3.2e+11p ps=2.64e+06u
-M1012 VPWR A a_1235_347# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 COUT a_418_74# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=2.9966e+12p ps=2.115e+07u
-M1014 VGND a_418_74# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_734_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1016 a_1024_74# a_418_74# a_734_74# VNB nshort w=740000u l=150000u
-+  ad=3.922e+11p pd=2.54e+06u as=0p ps=0u
-M1017 a_1141_347# CIN a_1024_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 COUT a_418_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 COUT a_418_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1024_74# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1021 SUM a_1024_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 COUT a_418_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_532_74# B a_418_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=3.108e+11p ps=2.32e+06u
-M1024 SUM a_1024_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1160_74# CIN a_1024_74# VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1026 a_27_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=0p ps=0u
-M1027 a_734_74# CIN VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_418_74# CIN a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND B a_734_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1024_74# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND A a_532_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_1024_74# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_418_74# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 SUM a_1024_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1238_74# B a_1160_74# VNB nshort w=740000u l=150000u
-+  ad=2.664e+11p pd=2.2e+06u as=0p ps=0u
-M1038 a_418_74# CIN a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A a_1238_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_734_74# a_418_74# a_1024_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 COUT a_418_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 SUM a_1024_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_418_74# B a_535_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR a_1024_74# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_1160_74# B a_1238_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 COUT a_418_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR B a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_1024_74# CIN a_1160_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 COUT a_418_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND CIN a_734_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_1141_347# B a_1235_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 VPWR a_1024_74# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_535_347# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_1235_347# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_737_347# a_418_74# a_1024_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 SUM a_1024_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VGND A a_734_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_737_347# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 VPWR A a_737_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_418_74# B a_532_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_27_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_27_392# CIN a_418_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X24 VPWR CIN a_737_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_532_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 COUT a_418_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_1024_74# CIN a_1141_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X28 VGND a_418_74# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VPWR a_418_74# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 VGND a_1024_74# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_734_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 VGND a_1024_74# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 SUM a_1024_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 SUM a_1024_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 VPWR a_418_74# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 VGND a_418_74# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 a_27_74# CIN a_418_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 a_1238_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/fah/sky130_fd_sc_ls__fah_1.cdl b/cells/fah/sky130_fd_sc_ls__fah_1.cdl
index 9c5aa8c..35fd986 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_1.cdl
+++ b/cells/fah/sky130_fd_sc_ls__fah_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__fah_1 A B CI VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT net195 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT net195 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
-MMIN3 SUM net123 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 CIb mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Bb mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CIbb mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 CIb mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB 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
-MI46 CIbb CIb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 CIb CI VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab2 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Abb2 Ab2 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
-MI14 Ab1 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb2 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab1 Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb2 Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab1 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT net195 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMIN3 SUM net123 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
-MMIP3 SUM net123 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI6 CIb mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Bb mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CIbb mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CIb mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CIb mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI3 Bb mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 CIbb CIb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CIbb mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 CIb CI VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CIb mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Ab2 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Abb2 Ab2 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
-MI47 CIbb CIb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 Ab1 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 CIb CI VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI20 Abb2 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab2 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 Ab1 Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abb2 Ab2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Abb2 Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 Ab1 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Ab1 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 Abb2 Bb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 COUT net195 VPB 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
+MMIP3 SUM net123 VPB 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
+MI4 CIb mid1 VPB 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
+MI3 Bb mid2 VPB 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
+MI1 CIbb mid1 VPB 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
+MI650 CIb mid2 VPB 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
+MI16 Bb B VPB 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 Ab1 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 CIbb CIb VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 CIb CI VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 Ab2 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 Abb2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 Abb2 Ab2 VPB 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
+MI19 Ab1 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab1 Bb VPB 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
+MI22 Abb2 Bb VPB 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
+MI23 Ab1 B VPB 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
+MI26 Abb2 B VPB 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
+MI27 Ab1 Bb VPB 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
 .ENDS sky130_fd_sc_ls__fah_1
diff --git a/cells/fah/sky130_fd_sc_ls__fah_1.netlist.tsv b/cells/fah/sky130_fd_sc_ls__fah_1.netlist.tsv
index fa51073..c90c6d5 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_1.netlist.tsv
+++ b/cells/fah/sky130_fd_sc_ls__fah_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__fah_1	A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	net195	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net123	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb	mid2	net195	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Bb	mid1	net195	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb	mid2	net123	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb	mid1	net123	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	CIbb	CIb	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	CIb	CI	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab2	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Abb2	Ab2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Ab1	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb2	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab1	Bb	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb2	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab1	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	net195	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	net123	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb	mid1	net195	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb	mid2	net195	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb	mid1	net123	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb	mid2	net123	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	CIbb	CIb	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	CIb	CI	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab2	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abb2	Ab2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	Ab1	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb2	Bb	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab1	B	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb2	B	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab1	Bb	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	net195	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net123	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb	mid2	net195	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Bb	mid1	net195	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb	mid2	net123	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb	mid1	net123	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	CIbb	CIb	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	CIb	CI	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab2	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Abb2	Ab2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Ab1	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb2	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab1	Bb	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb2	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab1	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	net195	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net123	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb	mid1	net195	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bb	mid2	net195	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb	mid1	net123	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb	mid2	net123	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	CIbb	CIb	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	CIb	CI	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab2	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	Ab1	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb2	Bb	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab1	B	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb2	B	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab1	Bb	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fah/sky130_fd_sc_ls__fah_1.spice b/cells/fah/sky130_fd_sc_ls__fah_1.spice
index 31ee226..0d90f20 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_1.spice
+++ b/cells/fah/sky130_fd_sc_ls__fah_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__fah_1 A B CI VGND VNB VPB VPWR COUT SUM
-M1000 VPWR B a_879_55# VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.39732e+12p pd=1.594e+07u as=4.036e+11p ps=3.01e+06u
-M1001 VPWR A a_1849_374# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=1.61635e+12p ps=7.38e+06u
-M1002 a_811_379# a_879_55# a_1849_374# VNB nshort w=640000u l=150000u
-+  ad=6.528e+11p pd=3.32e+06u as=5.128e+11p ps=4.25e+06u
-M1003 a_1023_379# a_879_55# a_1660_374# VNB nshort w=640000u l=150000u
-+  ad=4.965e+11p pd=2.98e+06u as=5.157e+11p ps=4.37e+06u
-M1004 VGND a_410_58# COUT VNB nshort w=740000u l=150000u
-+  ad=1.8144e+12p pd=1.292e+07u as=2.072e+11p ps=2.04e+06u
-M1005 a_231_132# CI VGND VNB nshort w=640000u l=150000u
-+  ad=3.808e+11p pd=3.75e+06u as=0p ps=0u
-M1006 a_2342_48# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1007 a_2342_48# A VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1008 a_879_55# a_1023_379# a_410_58# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=5.082e+11p ps=2.89e+06u
-M1009 a_231_132# a_1023_379# a_410_58# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.6395e+11p ps=2.41e+06u
-M1010 a_231_132# CI VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=1.10822e+12p pd=6.61e+06u as=0p ps=0u
-M1011 a_83_21# a_811_379# a_644_104# VPB phighvt w=840000u l=150000u
-+  ad=7.644e+11p pd=3.5e+06u as=5.58725e+11p ps=3.27e+06u
-M1012 a_1023_379# a_879_55# a_1849_374# VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1013 a_410_58# a_811_379# a_231_132# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A a_1849_374# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_231_132# a_1023_379# a_83_21# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_644_104# a_1023_379# a_83_21# VNB nshort w=640000u l=150000u
-+  ad=4.1745e+11p pd=3.87e+06u as=2.375e+11p ps=2.16e+06u
-M1017 a_644_104# a_231_132# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1660_374# B a_1023_379# VPB phighvt w=840000u l=150000u
-+  ad=6.202e+11p pd=5.22e+06u as=0p ps=0u
-M1019 VPWR a_83_21# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1020 a_811_379# a_879_55# a_1660_374# VPB phighvt w=840000u l=150000u
-+  ad=2.94e+11p pd=2.38e+06u as=0p ps=0u
-M1021 VGND a_2342_48# a_1660_374# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B a_879_55# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.9405e+11p ps=5.22e+06u
-M1023 a_644_104# a_231_132# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_2342_48# a_1660_374# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1660_374# B a_811_379# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_410_58# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.6765e+11p ps=3.29e+06u
-M1027 VGND a_83_21# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1028 a_1849_374# B a_1023_379# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1849_374# B a_811_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_410_58# a_811_379# a_879_55# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_83_21# a_811_379# a_231_132# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1660_374# a_2342_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 SUM a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND CI a_231_132# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 COUT a_410_58# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_1849_374# a_879_55# a_811_379# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VGND A a_2342_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_410_58# a_1023_379# a_879_55# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_1660_374# a_879_55# a_811_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_879_55# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_1023_379# B a_1849_374# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_410_58# a_1023_379# a_231_132# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_1849_374# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 COUT a_410_58# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_1849_374# a_879_55# a_1023_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_811_379# B a_1849_374# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_1660_374# a_879_55# a_1023_379# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_811_379# B a_1660_374# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_1849_374# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 VPWR A a_2342_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 SUM a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_879_55# a_811_379# a_410_58# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_879_55# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VPWR a_231_132# a_644_104# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_83_21# a_1023_379# a_644_104# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 a_231_132# a_811_379# a_410_58# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_1023_379# B a_1660_374# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X26 VGND a_231_132# a_644_104# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VPWR CI a_231_132# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X28 a_231_132# a_811_379# a_83_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X29 a_644_104# a_811_379# a_83_21# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_83_21# a_1023_379# a_231_132# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X31 a_1660_374# a_2342_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/fah/sky130_fd_sc_ls__fah_2.cdl b/cells/fah/sky130_fd_sc_ls__fah_2.cdl
index 2cc69e5..42dcdfa 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_2.cdl
+++ b/cells/fah/sky130_fd_sc_ls__fah_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__fah_2 A B CI VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT net195 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT net195 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
-MMIN3 SUM net123 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
-MI6 CIb mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Bb mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CIbb mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 CIb mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB 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
-MI46 CIbb CIb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 CIb CI VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab2 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Abb2 Ab2 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
-MI14 Ab1 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb2 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab1 Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb2 Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab1 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT net195 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMIN3 SUM net123 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
-MMIP3 SUM net123 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MI6 CIb mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Bb mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CIbb mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CIb mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CIb mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI3 Bb mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 CIbb CIb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CIbb mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 CIb CI VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CIb mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Ab2 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Abb2 Ab2 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
-MI47 CIbb CIb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 Ab1 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 CIb CI VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI20 Abb2 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab2 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 Ab1 Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abb2 Ab2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Abb2 Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 Ab1 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Ab1 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 Abb2 Bb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 COUT net195 VPB 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
+MMIP3 SUM net123 VPB 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
+MI4 CIb mid1 VPB 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
+MI3 Bb mid2 VPB 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
+MI1 CIbb mid1 VPB 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
+MI650 CIb mid2 VPB 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
+MI16 Bb B VPB 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 Ab1 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 CIbb CIb VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 CIb CI VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 Ab2 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 Abb2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 Abb2 Ab2 VPB 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
+MI19 Ab1 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab1 Bb VPB 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
+MI22 Abb2 Bb VPB 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
+MI23 Ab1 B VPB 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
+MI26 Abb2 B VPB 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
+MI27 Ab1 Bb VPB 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
 .ENDS sky130_fd_sc_ls__fah_2
diff --git a/cells/fah/sky130_fd_sc_ls__fah_2.netlist.tsv b/cells/fah/sky130_fd_sc_ls__fah_2.netlist.tsv
index fc68cdb..52bd4ff 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_2.netlist.tsv
+++ b/cells/fah/sky130_fd_sc_ls__fah_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__fah_2	A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	net195	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net123	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb	mid2	net195	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Bb	mid1	net195	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb	mid2	net123	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb	mid1	net123	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	CIbb	CIb	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	CIb	CI	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab2	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Abb2	Ab2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Ab1	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb2	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab1	Bb	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb2	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab1	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	net195	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	net123	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb	mid1	net195	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb	mid2	net195	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb	mid1	net123	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb	mid2	net123	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	CIbb	CIb	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	CIb	CI	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab2	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abb2	Ab2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	Ab1	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb2	Bb	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab1	B	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb2	B	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab1	Bb	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	net195	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net123	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb	mid2	net195	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Bb	mid1	net195	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb	mid2	net123	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb	mid1	net123	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	CIbb	CIb	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	CIb	CI	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab2	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Abb2	Ab2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Ab1	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb2	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab1	Bb	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb2	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab1	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	net195	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net123	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb	mid1	net195	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bb	mid2	net195	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb	mid1	net123	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb	mid2	net123	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	CIbb	CIb	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	CIb	CI	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab2	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	Ab1	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb2	Bb	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab1	B	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb2	B	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab1	Bb	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fah/sky130_fd_sc_ls__fah_2.spice b/cells/fah/sky130_fd_sc_ls__fah_2.spice
index 32cfaf8..3b78065 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_2.spice
+++ b/cells/fah/sky130_fd_sc_ls__fah_2.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ls__fah_2 A B CI VGND VNB VPB VPWR COUT SUM
-M1000 a_481_379# B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.948e+11p pd=2.99e+06u as=2.5648e+12p ps=2.029e+07u
-M1001 a_1895_424# a_514_424# a_1689_424# VPB phighvt w=840000u l=150000u
-+  ad=5.334e+11p pd=2.95e+06u as=1.0242e+12p ps=6.01e+06u
-M1002 a_413_392# A VGND VNB nshort w=640000u l=150000u
-+  ad=4.247e+11p pd=4.22e+06u as=1.82425e+12p ps=1.593e+07u
-M1003 a_514_424# B a_413_392# VNB nshort w=640000u l=150000u
-+  ad=3.904e+11p pd=2.5e+06u as=0p ps=0u
-M1004 a_849_424# B a_114_368# VNB nshort w=640000u l=150000u
-+  ad=4.448e+11p pd=2.67e+06u as=7.401e+11p ps=4.99e+06u
-M1005 VPWR a_1689_424# a_2052_424# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=4.918e+11p ps=3.07e+06u
-M1006 a_1895_424# a_849_424# a_1689_424# VNB nshort w=640000u l=150000u
-+  ad=4.729e+11p pd=2.9e+06u as=6.112e+11p ps=4.47e+06u
-M1007 a_114_368# a_481_379# a_514_424# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 COUT a_1451_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1009 VGND a_1689_424# a_2052_424# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.12e+06u
-M1010 a_1689_424# a_849_424# a_1451_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=8.736e+11p ps=3.76e+06u
-M1011 COUT a_1451_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1012 VGND A a_81_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.272e+11p ps=1.99e+06u
-M1013 a_514_424# a_481_379# a_413_392# VPB phighvt w=840000u l=150000u
-+  ad=7.686e+11p pd=3.51e+06u as=5.8e+11p ps=4.96e+06u
-M1014 VPWR a_1451_424# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1451_424# a_849_424# a_481_379# VNB nshort w=640000u l=150000u
-+  ad=5.6e+11p pd=3.03e+06u as=2.33e+11p ps=2.13e+06u
-M1016 VPWR A a_81_260# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1017 a_413_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_2052_424# a_849_424# a_1895_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1689_424# a_514_424# a_1451_424# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_413_392# B a_849_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=1.1298e+12p ps=4.37e+06u
-M1021 a_114_368# B a_514_424# VPB phighvt w=840000u l=150000u
-+  ad=7e+11p pd=5.4e+06u as=0p ps=0u
-M1022 a_1689_424# CI VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 SUM a_1895_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.472e+11p pd=2.86e+06u as=0p ps=0u
-M1024 VGND a_1895_424# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.146e+11p ps=2.06e+06u
-M1025 VPWR a_1895_424# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1451_424# a_514_424# a_481_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_413_392# a_481_379# a_849_424# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1689_424# CI VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_2052_424# a_514_424# a_1895_424# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_114_368# a_81_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 SUM a_1895_424# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_481_379# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_849_424# a_481_379# a_114_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_114_368# a_81_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_1451_424# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND CI a_1689_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR A a_413_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 COUT a_1451_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_81_260# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_413_392# B a_514_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_1451_424# a_514_424# a_1689_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 SUM a_1895_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_114_368# a_481_379# a_849_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_514_424# a_481_379# a_114_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 COUT a_1451_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 SUM a_1895_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR a_81_260# a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_1895_424# a_514_424# a_2052_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_413_392# a_481_379# a_514_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_481_379# a_849_424# a_1451_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_849_424# B a_413_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VPWR B a_481_379# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_481_379# a_514_424# a_1451_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_2052_424# a_1689_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VGND B a_481_379# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VPWR CI a_1689_424# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_114_368# B a_849_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 VGND a_1895_424# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_81_260# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X24 a_2052_424# a_1689_424# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 VGND a_1451_424# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_1451_424# a_849_424# a_1689_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 VGND A a_413_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 VPWR a_1895_424# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_514_424# B a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_1689_424# a_514_424# a_1895_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X31 a_849_424# a_481_379# a_413_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 a_1689_424# a_849_424# a_1895_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X33 a_1895_424# a_849_424# a_2052_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X34 VPWR a_1451_424# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 VGND a_81_260# a_114_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/fah/sky130_fd_sc_ls__fah_4.cdl b/cells/fah/sky130_fd_sc_ls__fah_4.cdl
index d05b960..3d7060a 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_4.cdl
+++ b/cells/fah/sky130_fd_sc_ls__fah_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__fah_4 A B CI VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT net195 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265
+MMIN2 COUT net195 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
-MMIN3 SUM net123 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
-MI6 CIb mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 Bb mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CIbb mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 CIb mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB 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
-MI46 CIbb CIb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 CIb CI VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Ab2 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Abb2 Ab2 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
-MI14 Ab1 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb2 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab1 Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb2 Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab1 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT net195 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMIN3 SUM net123 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
-MMIP3 SUM net123 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MI6 CIb mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 Bb mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CIbb mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CIb mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CIb mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI3 Bb mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 CIbb CIb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CIbb mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 CIb CI VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CIb mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Ab2 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Abb2 Ab2 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
-MI47 CIbb CIb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 Ab1 A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 CIb CI VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI20 Abb2 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab2 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 Ab1 Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 Abb2 Ab2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Abb2 Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 Ab1 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Ab1 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 Abb2 Bb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 COUT net195 VPB 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
+MMIP3 SUM net123 VPB 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
+MI4 CIb mid1 VPB 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
+MI3 Bb mid2 VPB 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
+MI1 CIbb mid1 VPB 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
+MI650 CIb mid2 VPB 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
+MI16 Bb B VPB 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 Ab1 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 CIbb CIb VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 CIb CI VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 Ab2 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 Abb2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 Abb2 Ab2 VPB 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
+MI19 Ab1 A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab1 Bb VPB 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
+MI22 Abb2 Bb VPB 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
+MI23 Ab1 B VPB 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
+MI26 Abb2 B VPB 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
+MI27 Ab1 Bb VPB 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
 .ENDS sky130_fd_sc_ls__fah_4
diff --git a/cells/fah/sky130_fd_sc_ls__fah_4.netlist.tsv b/cells/fah/sky130_fd_sc_ls__fah_4.netlist.tsv
index 774e16e..d78f134 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_4.netlist.tsv
+++ b/cells/fah/sky130_fd_sc_ls__fah_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__fah_4	A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	net195	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net123	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb	mid2	net195	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Bb	mid1	net195	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb	mid2	net123	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb	mid1	net123	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	CIbb	CIb	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	CIb	CI	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Ab2	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Abb2	Ab2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	Ab1	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb2	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab1	Bb	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb2	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab1	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	net195	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	net123	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb	mid1	net195	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb	mid2	net195	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb	mid1	net123	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb	mid2	net123	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	CIbb	CIb	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	CIb	CI	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab2	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	Abb2	Ab2	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	Ab1	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb2	Bb	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab1	B	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb2	B	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab1	Bb	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	net195	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net123	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb	mid2	net195	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Bb	mid1	net195	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb	mid2	net123	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb	mid1	net123	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	CIbb	CIb	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	CIb	CI	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Ab2	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Abb2	Ab2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	Ab1	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb2	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab1	Bb	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb2	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab1	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	net195	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net123	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb	mid1	net195	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bb	mid2	net195	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb	mid1	net123	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb	mid2	net123	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	CIbb	CIb	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	CIb	CI	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab2	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	Abb2	Ab2	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	Ab1	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb2	Bb	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab1	B	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb2	B	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab1	Bb	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fah/sky130_fd_sc_ls__fah_4.spice b/cells/fah/sky130_fd_sc_ls__fah_4.spice
index cdd75d8..2017007 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_4.spice
+++ b/cells/fah/sky130_fd_sc_ls__fah_4.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ls__fah_4 A B CI VGND VNB VPB VPWR COUT SUM
-M1000 a_200_74# a_586_257# a_528_362# VPB phighvt w=840000u l=150000u
-+  ad=7.739e+11p pd=5.79e+06u as=2.562e+11p ps=2.29e+06u
-M1001 a_427_362# a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=4.026e+11p pd=3.94e+06u as=3.15805e+12p ps=2.382e+07u
-M1002 a_1378_125# a_536_114# a_1265_379# VPB phighvt w=840000u l=150000u
-+  ad=7.451e+11p pd=5.69e+06u as=3.738e+11p ps=2.57e+06u
-M1003 SUM a_1278_102# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.832e+11p pd=5.7e+06u as=4.77725e+12p ps=2.973e+07u
-M1004 a_536_114# B a_200_74# VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1005 COUT a_1265_379# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1006 VGND a_1265_379# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 COUT a_1265_379# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1008 a_1278_102# a_528_362# a_1378_125# VPB phighvt w=840000u l=150000u
-+  ad=6.72e+11p pd=3.28e+06u as=0p ps=0u
-M1009 VGND a_1265_379# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_1278_102# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_427_362# a_586_257# a_536_114# VPB phighvt w=840000u l=150000u
-+  ad=6.202e+11p pd=5.22e+06u as=0p ps=0u
-M1012 a_586_257# B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.0435e+11p pd=3.01e+06u as=0p ps=0u
-M1013 VPWR a_1378_125# a_1183_102# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.90725e+11p ps=3e+06u
-M1014 VPWR a_1265_379# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND CI a_1378_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.616e+11p ps=3.69e+06u
-M1016 VPWR a_1265_379# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_536_114# B a_427_362# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1018 VGND a_1378_125# a_1183_102# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.4305e+11p ps=3.95e+06u
-M1019 VPWR CI a_1378_125# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 COUT a_1265_379# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_586_257# B VGND VNB nshort w=740000u l=150000u
-+  ad=5.59925e+11p pd=5.19e+06u as=0p ps=0u
-M1022 a_1278_102# a_528_362# a_1183_102# VNB nshort w=640000u l=150000u
-+  ad=2.44125e+11p pd=2.21e+06u as=0p ps=0u
-M1023 a_586_257# a_536_114# a_1265_379# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.3685e+11p ps=2.18e+06u
-M1024 COUT a_1265_379# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 SUM a_1278_102# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1026 a_200_74# a_586_257# a_536_114# VNB nshort w=640000u l=150000u
-+  ad=4.268e+11p pd=4.01e+06u as=0p ps=0u
-M1027 a_528_362# B a_200_74# VNB nshort w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=0p ps=0u
-M1028 VGND a_1278_102# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 SUM a_1278_102# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1183_102# a_536_114# a_1278_102# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1278_102# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_200_74# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_427_362# a_586_257# a_528_362# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1035 a_427_362# a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1265_379# a_528_362# a_586_257# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1038 a_200_74# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1378_125# a_536_114# a_1278_102# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1265_379# a_528_362# a_1378_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 SUM a_1278_102# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_528_362# B a_427_362# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND a_1278_102# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1278_102# a_536_114# a_1378_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 SUM a_1278_102# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR B a_586_257# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_536_114# a_586_257# a_200_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_1265_379# a_536_114# a_1378_125# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 VPWR a_1265_379# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 COUT a_1265_379# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_1183_102# a_1378_125# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_1278_102# a_536_114# a_1183_102# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 VGND A a_200_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_1378_125# CI VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND B a_586_257# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_427_362# B a_536_114# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_528_362# a_586_257# a_427_362# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_427_362# B a_528_362# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_1183_102# a_1378_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_1378_125# a_528_362# a_1265_379# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_586_257# a_528_362# a_1265_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_1265_379# a_536_114# a_586_257# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_200_74# B a_528_362# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 SUM a_1278_102# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_1378_125# a_528_362# a_1278_102# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 VGND a_27_74# a_427_362# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VGND a_1265_379# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_200_74# B a_536_114# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 COUT a_1265_379# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VPWR a_1278_102# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X28 COUT a_1265_379# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 a_1378_125# CI VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 VGND a_1278_102# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 VGND a_1278_102# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_528_362# a_586_257# a_200_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X33 COUT a_1265_379# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 VPWR a_1265_379# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 VPWR a_1278_102# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 a_1183_102# a_528_362# a_1278_102# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 VGND a_1265_379# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 VPWR A a_200_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X40 VPWR a_27_74# a_427_362# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X41 a_536_114# a_586_257# a_427_362# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X42 SUM a_1278_102# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X43 SUM a_1278_102# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.cdl b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.cdl
index a44fe06..9f0664d 100644
--- a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.cdl
+++ b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__fahcin_1 A B CIN VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIP3 SUM net144 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMIP3 SUM net144 VPB 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
-MI32 Bbb Bb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab Bb VPB 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
-MI26 Abb B VPB 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
-MI22 Abb Bb VPB 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
-MI23 Ab B VPB 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
-MI19 CINb1 CIN VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 CINbb2 CINb2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI32 Bbb Bb VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 CINb2 CIN VPB 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
-MI16 Bb B VPB 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
-MI650 CINbb2 mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI27 Ab Bb VPB 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
-MI45 Ab A VPB 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
-MI1 CINb2 mid1 VPB 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
-MI3 Bbb mid2 VPB 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
-MI4 CINb1 mid1 VPB 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
-MMIN3 SUM net144 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 CINb1 mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 CINb1 CIN VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 CINbb2 CINb2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 CINb2 CIN 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
-MI44 Ab 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
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB 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
-MI649 CINbb2 mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI26 Abb B VPB 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
-MI2 CINb2 mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI22 Abb Bb VPB 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
+MI23 Ab B VPB 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
-MI31 Bbb mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 CINb1 CIN VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 CINbb2 CINb2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 CINb2 CIN VPB 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
+MI16 Bb B VPB 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 Bbb Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 CINbb2 mid2 VPB 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
+MI45 Ab A VPB 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
+MI1 CINb2 mid1 VPB 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
+MI3 Bbb mid2 VPB 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
+MI4 CINb1 mid1 VPB 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
+MMIN3 SUM net144 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 CINb1 mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 Abb Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 Ab Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 CINb1 CIN VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 CINbb2 CINb2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 CINb2 CIN 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
+MI44 Ab 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
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 Bb B VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 CINbb2 mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CINb2 mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 Bbb mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Bbb Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__fahcin_1
diff --git a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.netlist.tsv b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.netlist.tsv
index 2f84cdc..ad42036 100644
--- a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.netlist.tsv
+++ b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__fahcin_1	A:I B:I CIN:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	SUM	net144	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	Bbb	Bb	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab	Bb	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb	B	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb	Bb	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab	B	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	CINb1	CIN	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	CINbb2	CINb2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	CINb2	CIN	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CINbb2	mid2	net144	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CINb2	mid1	net144	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bbb	mid2	COUT	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CINb1	mid1	COUT	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net144	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CINb1	mid2	COUT	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab	Bb	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	CINb1	CIN	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	CINbb2	CINb2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	CINb2	CIN	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CINbb2	mid1	net144	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CINb2	mid2	net144	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	Bbb	mid1	COUT	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Bbb	Bb	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net144	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	Bbb	Bb	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab	Bb	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb	B	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb	Bb	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab	B	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	CINb1	CIN	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	CINbb2	CINb2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	CINb2	CIN	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CINbb2	mid2	net144	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CINb2	mid1	net144	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bbb	mid2	COUT	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CINb1	mid1	COUT	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net144	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CINb1	mid2	COUT	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab	Bb	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	CINb1	CIN	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	CINbb2	CINb2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	CINb2	CIN	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CINbb2	mid1	net144	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CINb2	mid2	net144	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	Bbb	mid1	COUT	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Bbb	Bb	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.spice b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.spice
index f040454..74b9fb6 100644
--- a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.spice
+++ b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__fahcin_1 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_1854_368# a_430_418# a_2004_136# VPB phighvt w=840000u l=150000u
-+  ad=7.6195e+11p pd=5.9e+06u as=2.52e+11p ps=2.28e+06u
-M1001 a_608_74# B a_28_74# VNB nshort w=640000u l=150000u
-+  ad=3.40325e+11p pd=2.79e+06u as=3.901e+11p ps=3.89e+06u
-M1002 VPWR a_1854_368# a_1967_384# VPB phighvt w=1e+06u l=150000u
-+  ad=2.1852e+12p pd=1.304e+07u as=5.428e+11p ps=4.86e+06u
-M1003 a_1595_400# a_430_418# COUT VPB phighvt w=840000u l=150000u
-+  ad=4.256e+11p pd=2.88e+06u as=1.0542e+12p ps=4.19e+06u
-M1004 a_256_368# a_28_74# VGND VNB nshort w=640000u l=150000u
-+  ad=5.088e+11p pd=4.15e+06u as=1.989e+12p ps=1.212e+07u
-M1005 a_1854_368# CIN VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1967_384# a_430_418# a_2004_136# VNB nshort w=640000u l=150000u
-+  ad=2.808e+11p pd=2.29e+06u as=5.088e+11p ps=2.87e+06u
-M1007 a_256_368# a_492_48# a_430_418# VPB phighvt w=840000u l=150000u
-+  ad=5.806e+11p pd=4.95e+06u as=5.334e+11p ps=4.63e+06u
-M1008 a_430_418# B a_28_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=8.05e+11p ps=5.64e+06u
-M1009 VPWR A a_28_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_28_74# a_492_48# a_608_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.57525e+11p ps=2.84e+06u
-M1011 a_1197_368# a_492_48# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=4.126e+11p pd=2.87e+06u as=0p ps=0u
-M1012 a_28_74# a_492_48# a_430_418# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.648e+11p ps=3.7e+06u
-M1013 VGND B a_492_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.22e+11p ps=2.08e+06u
-M1014 VPWR B a_492_48# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1015 a_2004_136# a_608_74# a_1854_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.33e+11p ps=2.13e+06u
-M1016 VGND A a_28_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND CIN a_1595_400# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.24e+11p ps=1.98e+06u
-M1018 SUM a_2004_136# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1019 a_608_74# B a_256_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1595_400# a_608_74# COUT VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=9.056e+11p ps=4.11e+06u
-M1021 COUT a_608_74# a_1197_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_256_368# a_492_48# a_608_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1197_368# a_492_48# VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1024 SUM a_2004_136# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1025 VPWR CIN a_1595_400# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_2004_136# a_608_74# a_1967_384# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_430_418# B a_256_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_256_368# a_28_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_1854_368# a_1967_384# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 COUT a_430_418# a_1197_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1854_368# CIN VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_492_48# a_1197_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_608_74# a_492_48# a_256_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR a_28_74# a_256_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_430_418# a_492_48# a_28_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VGND a_2004_136# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_1854_368# a_608_74# a_2004_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_1967_384# a_1854_368# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_1197_368# a_608_74# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_2004_136# a_430_418# a_1854_368# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_28_74# B a_430_418# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VPWR CIN a_1854_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_492_48# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VGND a_28_74# a_256_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_28_74# B a_608_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 COUT a_430_418# a_1595_400# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_28_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_1595_400# CIN VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_1595_400# CIN VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_28_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VPWR a_2004_136# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_1197_368# a_430_418# COUT VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VGND CIN a_1854_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_1967_384# a_1854_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_430_418# a_492_48# a_256_368# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 VGND a_492_48# a_1197_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 COUT a_608_74# a_1595_400# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 a_492_48# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_1967_384# a_608_74# a_2004_136# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X28 a_256_368# B a_608_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 a_608_74# a_492_48# a_28_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_256_368# B a_430_418# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 a_2004_136# a_430_418# a_1967_384# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.cdl b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.cdl
index f3c9105..8b9fa20 100644
--- a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.cdl
+++ b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__fahcon_1 A B CI VGND VNB VPB VPWR COUT_N SUM
 *.PININFO A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT_N:O SUM:O
-MMIP3 SUM net146 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMIP3 SUM net146 VPB 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
-MI32 Bb2 B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI32 Bb2 B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 Ab Bb1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 Ab Bb1 VPB 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
+MI26 Abb B VPB 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
+MI22 Abb Bb1 VPB 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
+MI23 Ab B VPB 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
-MI26 Abb B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 CIb1 CI VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 CIbb2 CIb2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 CIb2 CI VPB 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
+MI16 Bb1 B VPB 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
+MI650 CIb2 mid2 VPB 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
+MI45 Ab A VPB 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
-MI22 Abb Bb1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI1 CIbb2 mid1 VPB 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
+MI3 Bb2 mid2 VPB 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
+MI4 CIb1 mid1 VPB 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
+MMIN3 SUM net146 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 CIb1 mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 CIb1 CI VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Abb Bb1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 CIbb2 CIb2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 Ab Bb1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI20 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 CIb2 CI VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 CIb1 CI VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb1 B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 CIbb2 CIb2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 CIb2 CI 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
-MI650 CIb2 mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab 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
-MI45 Ab A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 CIbb2 mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb1 B 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
-MI3 Bb2 mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 CIb2 mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 CIbb2 mid2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 Bb2 mid1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 CIb1 mid1 VPB 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
-MMIN3 SUM net146 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 CIb1 mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Abb Bb1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 Ab Bb1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 CIb1 CI VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 CIbb2 CIb2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 CIb2 CI 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
-MI44 Ab 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
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb1 B 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
-MI649 CIb2 mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 CIbb2 mid2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 Bb2 mid1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Bb2 B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 Bb2 B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__fahcon_1
diff --git a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.netlist.tsv b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.netlist.tsv
index fa6c8d9..5f72f2a 100644
--- a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.netlist.tsv
+++ b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__fahcon_1	A:I B:I CI:I VGND:I VNB:I VPB:I VPWR:I COUT_N:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP3	MOSFET	SUM	net146	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	Bb2	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	Ab	Bb1	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	Abb	B	mid2	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	Abb	Bb1	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab	B	mid1	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	CIb1	CI	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	CIbb2	CIb2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	CIb2	CI	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb1	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb2	mid2	net146	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb2	mid1	net146	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb2	mid2	COUT_N	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb1	mid1	COUT_N	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net146	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb1	mid2	COUT_N	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Ab	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Abb	Bb1	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	Ab	Bb1	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Abb	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	CIb1	CI	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	CIbb2	CIb2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	CIb2	CI	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb1	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb2	mid1	net146	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb2	mid2	net146	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	Bb2	mid1	COUT_N	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Bb2	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net146	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	Bb2	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	Ab	Bb1	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	Abb	B	mid2	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	Abb	Bb1	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab	B	mid1	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	CIb1	CI	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	CIbb2	CIb2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	CIb2	CI	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb1	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb2	mid2	net146	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb2	mid1	net146	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	Bb2	mid2	COUT_N	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb1	mid1	COUT_N	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net146	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb1	mid2	COUT_N	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Ab	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Abb	Bb1	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	Ab	Bb1	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Abb	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	CIb1	CI	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	CIbb2	CIb2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	CIb2	CI	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb1	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb2	mid1	net146	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb2	mid2	net146	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	Bb2	mid1	COUT_N	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Bb2	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.spice b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.spice
index f753bec..39d6a45 100644
--- a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.spice
+++ b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__fahcon_1 A B CI VGND VNB VPB VPWR COUT_N SUM
-M1000 a_27_100# B a_369_365# VPB phighvt w=840000u l=150000u
-+  ad=5.824e+11p pd=5.11e+06u as=3.528e+11p ps=2.52e+06u
-M1001 a_374_120# a_336_263# a_241_368# VNB nshort w=640000u l=150000u
-+  ad=3.0045e+11p pd=2.29e+06u as=3.616e+11p ps=3.69e+06u
-M1002 a_1606_368# a_374_120# a_1744_94# VPB phighvt w=840000u l=150000u
-+  ad=5.782e+11p pd=5.1e+06u as=2.52e+11p ps=2.28e+06u
-M1003 a_1606_368# CI VGND VNB nshort w=740000u l=150000u
-+  ad=2.589e+11p pd=2.2e+06u as=1.579e+12p ps=1.063e+07u
-M1004 a_1023_389# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.706e+11p pd=2.77e+06u as=1.7464e+12p ps=1.216e+07u
-M1005 a_241_368# B a_374_120# VPB phighvt w=840000u l=150000u
-+  ad=7.0345e+11p pd=5.27e+06u as=4.228e+11p ps=2.86e+06u
-M1006 SUM a_1744_94# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 a_374_120# a_336_263# a_27_100# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_369_365# a_336_263# a_241_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1606_368# CI VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR CI a_1261_421# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=9.412e+11p ps=4.14e+06u
-M1011 a_27_100# B a_374_120# VNB nshort w=640000u l=150000u
-+  ad=3.965e+11p pd=3.91e+06u as=0p ps=0u
-M1012 a_241_368# a_27_100# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_27_100# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_241_368# B a_369_365# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.912e+11p ps=2.19e+06u
-M1015 COUT_N a_369_365# a_1023_389# VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=2.4e+06u as=4.992e+11p ps=2.84e+06u
-M1016 VGND a_1606_368# a_1719_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.264e+11p ps=2.3e+06u
-M1017 a_1261_421# a_374_120# COUT_N VNB nshort w=640000u l=150000u
-+  ad=3.52e+11p pd=2.38e+06u as=0p ps=0u
-M1018 a_1719_368# a_374_120# a_1744_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.224e+11p ps=2.6e+06u
-M1019 COUT_N a_374_120# a_1023_389# VPB phighvt w=840000u l=150000u
-+  ad=4.242e+11p pd=2.69e+06u as=0p ps=0u
-M1020 a_1261_421# a_369_365# COUT_N VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND B a_336_263# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=2.74e+06u
-M1022 VPWR A a_27_100# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1744_94# a_369_365# a_1719_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=6.983e+11p ps=5.61e+06u
-M1024 VGND CI a_1261_421# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1744_94# a_369_365# a_1606_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR B a_336_263# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1027 a_369_365# a_336_263# a_27_100# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 SUM a_1744_94# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1029 a_241_368# a_27_100# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1023_389# B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1606_368# a_1719_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_336_263# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_369_365# B a_241_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_1744_94# a_374_120# a_1606_368# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_27_100# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR a_27_100# a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VPWR B a_1023_389# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_27_100# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_1261_421# CI VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND a_1744_94# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_369_365# B a_27_100# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND CI a_1606_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND a_27_100# a_241_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_1719_368# a_1606_368# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 COUT_N a_369_365# a_1261_421# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_1261_421# CI VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_1719_368# a_369_365# a_1744_94# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_1719_368# a_1606_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_374_120# B a_241_368# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_241_368# a_336_263# a_374_120# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VPWR CI a_1606_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_27_100# a_336_263# a_369_365# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_336_263# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VPWR a_1744_94# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_1023_389# a_369_365# COUT_N VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 VGND B a_1023_389# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_27_100# a_336_263# a_374_120# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X26 a_374_120# B a_27_100# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 COUT_N a_374_120# a_1261_421# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 a_241_368# a_336_263# a_369_365# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 a_1023_389# a_374_120# COUT_N VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_1744_94# a_374_120# a_1719_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 a_1606_368# a_369_365# a_1744_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_ls__ha_1.cdl b/cells/ha/sky130_fd_sc_ls__ha_1.cdl
index 78cbf9a..22ed46b 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_1.cdl
+++ b/cells/ha/sky130_fd_sc_ls__ha_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__ha_1 A B VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT majb VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb 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
+MMIN3 SUM sumb 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
+MMNnand0 VGND A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs1 sumb majb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs20 VGND A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs1 sumb majb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs20 VGND A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs21 VGND B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB 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
-MMIP3 SUM sumb VPB 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
-MMPnand0 majb A VPB 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
-MMPnand1 majb B VPB 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
-MMPs1 VPWR majb VPB 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
-MMPs20 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs21 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB 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
+MMIP3 SUM sumb VPB 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
+MMPnand0 majb A VPB 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
+MMPnand1 majb B VPB 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
+MMPs1 VPWR majb VPB 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
+MMPs20 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs21 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 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_ls__ha_1
diff --git a/cells/ha/sky130_fd_sc_ls__ha_1.netlist.tsv b/cells/ha/sky130_fd_sc_ls__ha_1.netlist.tsv
index 15b0b37..971ca50 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_1.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_ls__ha_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__ha_1	A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	majb	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	majb	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1	MOSFET	VPWR	majb	sumb	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ha/sky130_fd_sc_ls__ha_1.spice b/cells/ha/sky130_fd_sc_ls__ha_1.spice
index 933fbba..aeb2f95 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_1.spice
+++ b/cells/ha/sky130_fd_sc_ls__ha_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__ha_1 A B VGND VNB VPB VPWR COUT SUM
-M1000 a_695_119# B a_239_294# VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.824e+11p ps=1.85e+06u
-M1001 VPWR A a_239_294# VPB phighvt w=840000u l=150000u
-+  ad=1.732e+12p pd=1.002e+07u as=2.52e+11p ps=2.28e+06u
-M1002 a_83_260# a_239_294# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.406e+11p pd=2.71e+06u as=0p ps=0u
-M1003 a_386_392# B a_83_260# VPB phighvt w=1e+06u l=150000u
-+  ad=4.2e+11p pd=2.84e+06u as=0p ps=0u
-M1004 COUT a_239_294# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1005 COUT a_239_294# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=6.95225e+11p ps=6.36e+06u
-M1006 VPWR a_83_260# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1007 a_305_130# a_239_294# a_83_260# VNB nshort w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=1.726e+11p ps=1.85e+06u
-M1008 VGND B a_305_130# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_695_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_239_294# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_83_260# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1012 VPWR A a_386_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_305_130# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_239_294# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_83_260# a_239_294# a_305_130# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_239_294# B a_695_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR a_239_294# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_386_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_305_130# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 SUM a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND a_239_294# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_239_294# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 VPWR a_239_294# a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND A a_305_130# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 SUM a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_83_260# B a_386_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_695_119# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_ls__ha_2.cdl b/cells/ha/sky130_fd_sc_ls__ha_2.cdl
index bafcb95..172b5c8 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_2.cdl
+++ b/cells/ha/sky130_fd_sc_ls__ha_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__ha_2 A B VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT majb VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb 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
+MMIN3 SUM sumb 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
+MMNnand0 VGND 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
+MMNnand1 sndNA B 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
+MMNs1 sumb majb 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
+MMNs20 VGND 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
-MMIN3 SUM sumb VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND B 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
-MMNnand0 VGND 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
-MMNnand1 sndNA B 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
-MMNs1 sumb majb 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
-MMNs20 VGND 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
-MMNs21 VGND B 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
-MMIP2 COUT majb VPB 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
-MMIP3 SUM sumb VPB 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
-MMPnand0 majb A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 majb B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs1 VPWR majb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs20 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs21 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB 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
+MMIP3 SUM sumb VPB 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
+MMPnand0 majb A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 majb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs1 VPWR majb VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs20 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs21 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 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_ls__ha_2
diff --git a/cells/ha/sky130_fd_sc_ls__ha_2.netlist.tsv b/cells/ha/sky130_fd_sc_ls__ha_2.netlist.tsv
index 956defc..2b71752 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_2.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_ls__ha_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__ha_2	A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	majb	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	majb	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1	MOSFET	VPWR	majb	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ha/sky130_fd_sc_ls__ha_2.spice b/cells/ha/sky130_fd_sc_ls__ha_2.spice
index 38e35ae..aafda88 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_2.spice
+++ b/cells/ha/sky130_fd_sc_ls__ha_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__ha_2 A B VGND VNB VPB VPWR COUT SUM
-M1000 a_278_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=4.083e+11p pd=4.09e+06u as=1.01665e+12p ps=1.023e+07u
-M1001 VPWR a_391_388# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.0936e+12p pd=1.472e+07u as=3.36e+11p ps=2.84e+06u
-M1002 a_307_388# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1003 SUM a_391_388# VGND VNB nshort w=740000u l=150000u
-+  ad=2.442e+11p pd=2.14e+06u as=0p ps=0u
-M1004 COUT a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1005 a_27_74# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1006 VPWR A a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_74# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_27_74# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1009 VGND B a_278_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_114_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1011 VPWR a_27_74# a_391_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=9.9e+11p ps=3.98e+06u
-M1012 VGND a_391_388# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_114_74# B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1014 SUM a_391_388# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_278_74# a_27_74# a_391_388# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.01625e+11p ps=2.05e+06u
-M1016 a_391_388# B a_307_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 COUT a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_278_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_278_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 COUT a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND a_391_388# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_391_388# a_27_74# a_278_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_27_74# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 SUM a_391_388# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND a_27_74# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_391_388# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A a_307_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 COUT a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR B a_27_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_307_388# B a_391_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_114_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_27_74# B a_114_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 SUM a_391_388# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_27_74# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_391_388# a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_ls__ha_4.cdl b/cells/ha/sky130_fd_sc_ls__ha_4.cdl
index cb0b310..20d242c 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_4.cdl
+++ b/cells/ha/sky130_fd_sc_ls__ha_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__ha_4 A B VGND VNB VPB VPWR COUT SUM
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
-MMIN2 COUT majb VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb 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
+MMIN3 SUM sumb 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
+MMNnand0 VGND A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand1 sndNA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs1 sumb majb VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs20 VGND A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs1 sumb majb VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs20 VGND A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNs21 VGND B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 COUT majb VPB phighvt 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
-MMIP3 SUM sumb VPB phighvt 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
-MMPnand0 majb A VPB phighvt m=2 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
-MMPnand1 majb B VPB phighvt m=2 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
-MMPs1 VPWR majb VPB phighvt m=2 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
-MMPs20 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPs21 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 COUT majb VPB 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
+MMIP3 SUM sumb VPB 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
+MMPnand0 majb A VPB pfet_01v8_hvt m=2 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
+MMPnand1 majb B VPB pfet_01v8_hvt m=2 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
+MMPs1 VPWR majb VPB pfet_01v8_hvt m=2 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
+MMPs20 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPs21 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 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_ls__ha_4
diff --git a/cells/ha/sky130_fd_sc_ls__ha_4.netlist.tsv b/cells/ha/sky130_fd_sc_ls__ha_4.netlist.tsv
index f9ac22d..e04f29d 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_4.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_ls__ha_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__ha_4	A:I B:I VGND:I VNB:I VPB:I VPWR:I COUT:O SUM:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	majb	A	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	majb	B	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1	MOSFET	VPWR	majb	sumb	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ha/sky130_fd_sc_ls__ha_4.spice b/cells/ha/sky130_fd_sc_ls__ha_4.spice
index f8b6261..1aed954 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_4.spice
+++ b/cells/ha/sky130_fd_sc_ls__ha_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ls__ha_4 A B VGND VNB VPB VPWR COUT SUM
-M1000 VGND B a_27_125# VNB nshort w=640000u l=150000u
-+  ad=1.6734e+12p pd=1.601e+07u as=7.744e+11p ps=7.54e+06u
-M1001 a_707_119# B a_435_99# VNB nshort w=640000u l=150000u
-+  ad=5.856e+11p pd=5.67e+06u as=1.792e+11p ps=1.84e+06u
-M1002 VGND A a_707_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_294_392# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=5.069e+11p ps=4.33e+06u
-M1004 a_27_125# B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 SUM a_294_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.632e+11p pd=6.2e+06u as=2.9278e+12p ps=2.402e+07u
-M1006 VGND a_435_99# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1007 a_294_392# B a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=5.52e+11p pd=4.88e+06u as=8.7e+11p ps=7.74e+06u
-M1008 a_707_119# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_294_392# a_435_99# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_435_99# COUT VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_125# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B a_435_99# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=7.96825e+11p ps=6.01e+06u
-M1013 VPWR a_294_392# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_392# B a_294_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 SUM a_294_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_435_99# a_294_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 COUT a_435_99# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=8.512e+11p pd=6e+06u as=0p ps=0u
-M1018 VPWR A a_435_99# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_435_99# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 SUM a_294_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A a_27_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_294_392# a_435_99# a_27_125# VNB nshort w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=0p ps=0u
-M1023 a_435_99# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 SUM a_294_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 COUT a_435_99# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_125# a_435_99# a_294_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_294_392# SUM VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 COUT a_435_99# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_294_392# SUM VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 COUT a_435_99# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_435_99# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_435_99# COUT VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR A a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_435_99# B a_707_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_125# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND a_294_392# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_125# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_294_392# a_435_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 a_294_392# a_435_99# a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 SUM a_294_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND a_435_99# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 SUM a_294_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND A a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VGND B a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_707_119# B a_435_99# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 COUT a_435_99# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_392# B a_294_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_435_99# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 COUT a_435_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VGND a_294_392# SUM VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 SUM a_294_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_125# a_435_99# a_294_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_27_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VPWR a_435_99# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND A a_707_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VGND a_435_99# COUT VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_435_99# B a_707_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 COUT a_435_99# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VPWR B a_435_99# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 VPWR a_294_392# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VPWR a_435_99# a_294_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_294_392# B a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X28 VPWR A a_435_99# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 VPWR a_294_392# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_707_119# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 VPWR A a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X32 VPWR a_435_99# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 a_435_99# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X34 SUM a_294_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 COUT a_435_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ls__inv_1.cdl b/cells/inv/sky130_fd_sc_ls__inv_1.cdl
index dd56b45..2aef1b3 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_1.cdl
+++ b/cells/inv/sky130_fd_sc_ls__inv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__inv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y 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
-MMIP1 Y A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB 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
 .ENDS sky130_fd_sc_ls__inv_1
diff --git a/cells/inv/sky130_fd_sc_ls__inv_1.netlist.tsv b/cells/inv/sky130_fd_sc_ls__inv_1.netlist.tsv
index f606a93..c1339e9 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_1.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ls__inv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__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
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ls__inv_1.spice b/cells/inv/sky130_fd_sc_ls__inv_1.spice
index 9e4702c..f441d09 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_1.spice
+++ b/cells/inv/sky130_fd_sc_ls__inv_1.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_ls__inv_1 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=3.864e+11p ps=2.93e+06u
-M1001 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.627e+11p ps=2.19e+06u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ls__inv_16.cdl b/cells/inv/sky130_fd_sc_ls__inv_16.cdl
index 75a6adb..3dda449 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_16.cdl
+++ b/cells/inv/sky130_fd_sc_ls__inv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__inv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=16 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=16 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
-MMIP1 Y A VPB phighvt m=16 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 Y A VPB pfet_01v8_hvt m=16 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
 .ENDS sky130_fd_sc_ls__inv_16
diff --git a/cells/inv/sky130_fd_sc_ls__inv_16.netlist.tsv b/cells/inv/sky130_fd_sc_ls__inv_16.netlist.tsv
index e76321d..e3c2fcc 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_16.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ls__inv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__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
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	16	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	16	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ls__inv_16.spice b/cells/inv/sky130_fd_sc_ls__inv_16.spice
index fdd8239..6b28db6 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_16.spice
+++ b/cells/inv/sky130_fd_sc_ls__inv_16.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__inv_16 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.4272e+12p pd=2.628e+07u as=2.7216e+12p ps=2.278e+07u
-M1001 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=1.6576e+12p pd=1.632e+07u as=2.2718e+12p ps=1.946e+07u
-M1003 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ls__inv_2.cdl b/cells/inv/sky130_fd_sc_ls__inv_2.cdl
index caaafc3..7eb8811 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_2.cdl
+++ b/cells/inv/sky130_fd_sc_ls__inv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__inv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y 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
-MMIP1 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB 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
 .ENDS sky130_fd_sc_ls__inv_2
diff --git a/cells/inv/sky130_fd_sc_ls__inv_2.netlist.tsv b/cells/inv/sky130_fd_sc_ls__inv_2.netlist.tsv
index 31c2ec8..d4b08b1 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_2.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ls__inv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__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
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ls__inv_2.spice b/cells/inv/sky130_fd_sc_ls__inv_2.spice
index 0d553c5..b1078ff 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_2.spice
+++ b/cells/inv/sky130_fd_sc_ls__inv_2.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ls__inv_2 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=6.384e+11p ps=5.62e+06u
-M1001 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=4.218e+11p ps=4.1e+06u
-M1003 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ls__inv_4.cdl b/cells/inv/sky130_fd_sc_ls__inv_4.cdl
index ef97e1a..50dfa95 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_4.cdl
+++ b/cells/inv/sky130_fd_sc_ls__inv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__inv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A 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
-MMIP1 Y A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB 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
 .ENDS sky130_fd_sc_ls__inv_4
diff --git a/cells/inv/sky130_fd_sc_ls__inv_4.netlist.tsv b/cells/inv/sky130_fd_sc_ls__inv_4.netlist.tsv
index ef84f61..f023495 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_4.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ls__inv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__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
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ls__inv_4.spice b/cells/inv/sky130_fd_sc_ls__inv_4.spice
index 0770a95..6a8fa47 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_4.spice
+++ b/cells/inv/sky130_fd_sc_ls__inv_4.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__inv_4 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=9.968e+11p ps=8.5e+06u
-M1001 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=6.882e+11p pd=6.3e+06u as=4.44e+11p ps=4.16e+06u
-M1002 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_ls__inv_8.cdl b/cells/inv/sky130_fd_sc_ls__inv_8.cdl
index 74d3421..98418b9 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_8.cdl
+++ b/cells/inv/sky130_fd_sc_ls__inv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_ls__inv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIN1 Y A VNB nshort m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=8 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
-MMIP1 Y A VPB phighvt m=8 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=8 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
 .ENDS sky130_fd_sc_ls__inv_8
diff --git a/cells/inv/sky130_fd_sc_ls__inv_8.netlist.tsv b/cells/inv/sky130_fd_sc_ls__inv_8.netlist.tsv
index cad3c9a..0448e7f 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_8.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_ls__inv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_ls__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
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_ls__inv_8.spice b/cells/inv/sky130_fd_sc_ls__inv_8.spice
index d480301..24a90e9 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_8.spice
+++ b/cells/inv/sky130_fd_sc_ls__inv_8.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__inv_8 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.8368e+12p pd=1.448e+07u as=1.344e+12p ps=1.136e+07u
-M1001 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=1.2025e+12p pd=1.065e+07u as=8.288e+11p ps=8.16e+06u
-M1002 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_1.cdl b/cells/maj3/sky130_fd_sc_ls__maj3_1.cdl
index 7b7d142..02caf02 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_1.cdl
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__maj3_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
-MMIN2 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMN10 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN20 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN30 y C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB 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
-MMN30 y C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN31 sndNCa A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB 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
-MMP10 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP11 sndPAb B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP20 VPWR C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP21 sndPCb B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP30 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP31 sndPAc C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP10 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP11 sndPAb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP20 VPWR C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP21 sndPCb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP30 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP31 sndPAc C VPB pfet_01v8_hvt m=1 w=1.0 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_ls__maj3_1
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_1.netlist.tsv b/cells/maj3/sky130_fd_sc_ls__maj3_1.netlist.tsv
index 05e498c..7bd4b09 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_1.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__maj3_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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_1.spice b/cells/maj3/sky130_fd_sc_ls__maj3_1.spice
index 41e59ef..e1716c5 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_1.spice
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__maj3_1 A B C VGND VNB VPB VPWR X
-M1000 a_598_384# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=7.768e+11p ps=5.73e+06u
-M1001 a_84_74# B a_226_384# VPB phighvt w=1e+06u l=150000u
-+  ad=6.25e+11p pd=5.25e+06u as=2.7e+11p ps=2.54e+06u
-M1002 a_226_384# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_84_74# X VNB nshort w=740000u l=150000u
-+  ad=5.466e+11p pd=4.39e+06u as=2.081e+11p ps=2.05e+06u
-M1004 a_84_74# B a_223_120# VNB nshort w=640000u l=150000u
-+  ad=4.177e+11p pd=4.01e+06u as=1.536e+11p ps=1.76e+06u
-M1005 a_595_136# A VGND VNB nshort w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1006 VPWR C a_406_384# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 VGND C a_403_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1008 a_84_74# C a_595_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_84_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1010 a_406_384# B a_84_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_84_74# C a_598_384# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_223_120# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_403_136# B a_84_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_595_136# C a_84_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_223_120# B a_84_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR A a_598_384# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_84_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 X a_84_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_598_384# C a_84_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_84_74# B a_406_384# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VPWR A a_226_384# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_406_384# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_84_74# B a_403_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_226_384# B a_84_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_403_136# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 VGND A a_223_120# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VGND A a_595_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_2.cdl b/cells/maj3/sky130_fd_sc_ls__maj3_2.cdl
index 8148d10..c03d6dc 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_2.cdl
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__maj3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMN10 y B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B 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
-MMN11 sndNBa A VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa 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
+MMN20 y B 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
-MMN20 y B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc C 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
+MMN30 y C 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
-MMN21 sndNBc C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa 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
+MMIP2 X y VPB 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
-MMN30 y C 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
-MMN31 sndNCa 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
-MMIP2 X y VPB 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
-MMP10 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP11 sndPAb B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP20 VPWR C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP21 sndPCb B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP30 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP31 sndPAc C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP10 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP11 sndPAb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP20 VPWR C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP21 sndPCb B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP30 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP31 sndPAc C VPB pfet_01v8_hvt m=1 w=1.0 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_ls__maj3_2
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_2.netlist.tsv b/cells/maj3/sky130_fd_sc_ls__maj3_2.netlist.tsv
index 0377f4c..40ac0be 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_2.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__maj3_2	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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_2.spice b/cells/maj3/sky130_fd_sc_ls__maj3_2.spice
index 2f39142..ac234bc 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_2.spice
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__maj3_2 A B C VGND VNB VPB VPWR X
-M1000 VPWR C a_584_347# VPB phighvt w=1e+06u l=150000u
-+  ad=1.5736e+12p pd=9.65e+06u as=3.1e+11p ps=2.62e+06u
-M1001 a_577_74# B a_87_264# VNB nshort w=740000u l=150000u
-+  ad=2.442e+11p pd=2.14e+06u as=4.181e+11p ps=4.09e+06u
-M1002 X a_87_264# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1003 VPWR a_87_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND C a_577_74# VNB nshort w=740000u l=150000u
-+  ad=1.2062e+12p pd=7.7e+06u as=0p ps=0u
-M1005 a_87_264# C a_790_368# VPB phighvt w=1e+06u l=150000u
-+  ad=5.95e+11p pd=5.19e+06u as=2.7e+11p ps=2.54e+06u
-M1006 a_393_368# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.73375e+11p pd=2.92e+06u as=0p ps=0u
-M1007 a_790_368# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_413_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_87_264# B a_413_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_87_264# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1011 a_793_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1012 a_87_264# C a_793_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_87_264# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_87_264# B a_393_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_584_347# B a_87_264# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_87_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR A a_790_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_413_74# B a_87_264# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_793_74# C a_87_264# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_577_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 X a_87_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A a_393_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_87_264# B a_577_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND A a_413_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_393_368# B a_87_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_584_347# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND A a_793_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VGND a_87_264# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_87_264# B a_584_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 VPWR a_87_264# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_790_368# C a_87_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_4.cdl b/cells/maj3/sky130_fd_sc_ls__maj3_4.cdl
index 91d9b22..34d4f40 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_4.cdl
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__maj3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMN10 y B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN20 y B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc C VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN30 y C VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB 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
-MMN30 y C VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN31 sndNCa A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt 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
-MMP10 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP11 sndPAb B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP20 VPWR C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP21 sndPCb B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP30 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP31 sndPAc C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP10 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP11 sndPAb B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP20 VPWR C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP21 sndPCb B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP30 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP31 sndPAc C VPB pfet_01v8_hvt m=2 w=1.0 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_ls__maj3_4
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_4.netlist.tsv b/cells/maj3/sky130_fd_sc_ls__maj3_4.netlist.tsv
index 47d556a..e9436dc 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_4.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__maj3_4	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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_4.spice b/cells/maj3/sky130_fd_sc_ls__maj3_4.spice
index 9e83c08..8d6b80c 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_4.spice
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__maj3_4 A B C VGND VNB VPB VPWR X
-M1000 VPWR a_219_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.1282e+12p pd=1.677e+07u as=6.72e+11p ps=5.68e+06u
-M1001 a_219_392# B a_501_392# VPB phighvt w=1e+06u l=150000u
-+  ad=9.5e+11p pd=7.9e+06u as=6.5e+11p ps=5.3e+06u
-M1002 a_219_392# C a_906_78# VNB nshort w=640000u l=150000u
-+  ad=5.376e+11p pd=5.52e+06u as=4.45475e+11p ps=4.25e+06u
-M1003 X a_219_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_906_78# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.2479e+12p ps=1.196e+07u
-M1005 a_501_392# B a_219_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_905_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1007 VGND C a_504_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.41775e+11p ps=4.6e+06u
-M1008 a_906_78# C a_219_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_906_78# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_219_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_219_392# B a_119_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6.5e+11p ps=5.3e+06u
-M1012 VPWR C a_501_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_114_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.7375e+11p ps=4.61e+06u
-M1014 a_119_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_219_392# C a_905_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_114_125# B a_219_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_504_125# C VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_905_392# C a_219_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_114_125# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_219_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.44e+11p ps=4.16e+06u
-M1021 VGND a_219_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_119_392# B a_219_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_219_392# B a_114_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_504_125# B a_219_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_219_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_219_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_501_392# C VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A a_905_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A a_119_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_219_392# B a_504_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 X a_219_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_125# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_219_392# B a_501_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND A a_114_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 X a_219_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A a_906_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_219_392# C a_905_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 X a_219_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_219_392# B a_119_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_501_392# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VGND C a_504_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_504_125# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR C a_501_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VPWR A a_905_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 X a_219_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_905_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_114_125# B a_219_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VGND a_219_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VPWR a_219_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_219_392# B a_504_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_219_392# C a_906_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 VPWR a_219_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 VPWR A a_119_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 a_119_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_906_78# C a_219_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 a_501_392# B a_219_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_219_392# B a_114_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 VGND a_219_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 X a_219_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 a_119_392# B a_219_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 a_504_125# B a_219_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 a_905_392# C a_219_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X31 a_906_78# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_1.cdl b/cells/mux2/sky130_fd_sc_ls__mux2_1.cdl
index e711e43..73f11ba 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_1.cdl
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 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
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb 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
+MMNA10 xb A1 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
-MMNA10 xb A1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S 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
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X xb 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
-MMIN1 Sb S VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb 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
-MMPA00 VPWR S VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB 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
-MMIP2 X xb VPB 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
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=1 w=1.12 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_ls__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_1.netlist.tsv b/cells/mux2/sky130_fd_sc_ls__mux2_1.netlist.tsv
index ba63873..9b8fafb 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_1.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_1.spice b/cells/mux2/sky130_fd_sc_ls__mux2_1.spice
index 2c6cc74..b9cdbf9 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_1.spice
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__mux2_1 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_443_74# A0 a_304_74# VNB nshort w=740000u l=150000u
-+  ad=5.994e+11p pd=3.1e+06u as=4.033e+11p ps=2.57e+06u
-M1001 X a_304_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=8.82e+11p ps=5.95e+06u
-M1002 a_524_368# A1 a_304_74# VPB phighvt w=1e+06u l=150000u
-+  ad=4.2e+11p pd=2.84e+06u as=3.9e+11p ps=2.78e+06u
-M1003 VGND S a_27_112# VNB nshort w=550000u l=150000u
-+  ad=7.0725e+11p pd=4.91e+06u as=1.5675e+11p ps=1.67e+06u
-M1004 a_304_74# A1 a_226_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1005 a_226_74# S VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_27_112# a_443_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR S a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1008 VPWR a_27_112# a_524_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_304_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1010 a_223_368# S VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=8.15e+11p pd=3.63e+06u as=0p ps=0u
-M1011 a_304_74# A0 a_223_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_223_368# A0 a_304_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND S a_226_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR S a_223_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_443_74# a_27_112# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND a_304_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_304_74# A0 a_443_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_112# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_524_368# a_27_112# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_226_74# A1 a_304_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_304_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_27_112# S VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 a_304_74# A1 a_524_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_2.cdl b/cells/mux2/sky130_fd_sc_ls__mux2_2.cdl
index 4713108..478e438 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_2.cdl
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__mux2_2 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 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
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb 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
+MMNA10 xb A1 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
-MMNA10 xb A1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S 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
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X xb 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
-MMIN1 Sb S VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb 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
-MMPA00 VPWR S VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB 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
-MMIP2 X xb VPB 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
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X xb VPB pfet_01v8_hvt m=2 w=1.12 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_ls__mux2_2
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_2.netlist.tsv b/cells/mux2/sky130_fd_sc_ls__mux2_2.netlist.tsv
index d4f82c1..0c29674 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_2.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__mux2_2	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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_2.spice b/cells/mux2/sky130_fd_sc_ls__mux2_2.spice
index 33d2f9b..bd27cca 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_2.spice
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__mux2_2 A0 A1 S VGND VNB VPB VPWR X
-M1000 VPWR S a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=1.2092e+12p pd=8.77e+06u as=5.9e+11p ps=5.18e+06u
-M1001 VPWR a_116_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1002 a_206_368# a_459_48# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.9e+11p pd=5.18e+06u as=0p ps=0u
-M1003 a_116_368# A0 a_38_74# VNB nshort w=740000u l=150000u
-+  ad=4.255e+11p pd=2.63e+06u as=4.292e+11p ps=4.12e+06u
-M1004 X a_116_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=9.4915e+11p ps=7.09e+06u
-M1005 a_38_74# a_459_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_270_74# A1 a_116_368# VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1007 VPWR S a_459_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1008 a_116_368# A0 a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1009 a_206_368# A1 a_116_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND S a_270_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND S a_459_48# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1012 X a_116_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_116_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_116_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_270_74# S VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_38_74# A0 a_116_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_116_368# A1 a_270_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR a_116_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_27_368# A0 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_27_368# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VPWR a_459_48# a_206_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_459_48# S VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_459_48# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_116_368# A1 a_206_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND a_116_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 X a_116_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND a_459_48# a_38_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_4.cdl b/cells/mux2/sky130_fd_sc_ls__mux2_4.cdl
index db73992..7dad937 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_4.cdl
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__mux2_4 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 xb A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X xb 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
-MMIN1 Sb S VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb 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
-MMPA00 VPWR S VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt 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
+MMIP2 X xb VPB 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
 .ENDS sky130_fd_sc_ls__mux2_4
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_4.netlist.tsv b/cells/mux2/sky130_fd_sc_ls__mux2_4.netlist.tsv
index a1eb891..d0437f1 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_4.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__mux2_4	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	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_4.spice b/cells/mux2/sky130_fd_sc_ls__mux2_4.spice
index 90a78f8..876f1c6 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_4.spice
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ls__mux2_4 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_937_119# a_27_368# VGND VNB nshort w=640000u l=150000u
-+  ad=3.712e+11p pd=3.72e+06u as=1.76805e+12p ps=1.249e+07u
-M1001 X a_193_241# VGND VNB nshort w=740000u l=150000u
-+  ad=4.44e+11p pd=4.16e+06u as=0p ps=0u
-M1002 VGND a_27_368# a_937_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR S a_722_391# VPB phighvt w=1e+06u l=150000u
-+  ad=2.49868e+12p pd=1.636e+07u as=6e+11p ps=5.2e+06u
-M1004 VPWR a_27_368# a_936_391# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1005 a_193_241# A1 a_936_391# VPB phighvt w=1e+06u l=150000u
-+  ad=9.85e+11p pd=7.97e+06u as=0p ps=0u
-M1006 VPWR a_193_241# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.13255e+12p ps=6.91e+06u
-M1007 a_936_391# a_27_368# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_193_241# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_193_241# A1 a_709_119# VNB nshort w=640000u l=150000u
-+  ad=9.216e+11p pd=6.72e+06u as=4.224e+11p ps=3.88e+06u
-M1010 X a_193_241# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_193_241# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR S a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1013 a_937_119# A0 a_193_241# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_193_241# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_722_391# A0 a_193_241# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_193_241# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_193_241# A0 a_937_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_193_241# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_722_391# S VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND S a_709_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_709_119# A1 a_193_241# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_193_241# A0 a_722_391# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_709_119# S VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_936_391# A1 a_193_241# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND S a_27_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
+X0 a_193_241# A0 a_722_391# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_193_241# A1 a_936_391# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND S a_709_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 X a_193_241# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR a_193_241# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND a_193_241# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_193_241# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_722_391# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_937_119# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_709_119# S VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_27_368# S VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VGND a_27_368# a_937_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 VPWR a_193_241# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND a_193_241# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_193_241# A1 a_709_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_27_368# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_722_391# A0 a_193_241# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_936_391# A1 a_193_241# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_936_391# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 X a_193_241# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VPWR a_27_368# a_936_391# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_937_119# A0 a_193_241# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 VPWR S a_722_391# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 X a_193_241# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_193_241# A0 a_937_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_709_119# A1 a_193_241# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.cdl b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.cdl
index 7b6ffa2..b7ff4e8 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.cdl
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__mux2i_1 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 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
-MMNA01 smdNA0 Sb 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
-MMNA10 Y A1 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
-MMNA11 sndNA1 S 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
-MMIN1 Sb S VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB 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
-MMPA01 sndPS A0 VPB 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
-MMPA10 VPWR Sb VPB 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
-MMPA11 sndPSb A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb 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
-MMIP1 Sb S VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 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
+MMNA11 sndNA1 S 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
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB 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
+MMPA01 sndPS A0 VPB 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
+MMPA10 VPWR Sb VPB 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
+MMPA11 sndPSb A1 VPB 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
+MMIP1 Sb S VPB 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
 .ENDS sky130_fd_sc_ls__mux2i_1
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.netlist.tsv b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.netlist.tsv
index 92e58af..e626ad8 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__mux2i_1	A0:I A1:I S: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
-MMNA00	MOSFET	Y	A0	smdNA0	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.spice b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.spice
index c957589..4bbd09f 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.spice
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__mux2i_1 A0 A1 S VGND VNB VPB VPWR Y
-M1000 a_426_74# a_114_74# VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=4.6755e+11p ps=3.99e+06u
-M1001 Y A0 a_426_74# VNB nshort w=740000u l=150000u
-+  ad=5.217e+11p pd=2.89e+06u as=0p ps=0u
-M1002 VPWR S a_223_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=5.754e+11p pd=5.09e+06u as=6.272e+11p ps=5.6e+06u
-M1003 a_225_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=0p ps=0u
-M1004 Y A0 a_223_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1005 a_399_368# a_114_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.272e+11p pd=5.6e+06u as=0p ps=0u
-M1006 a_114_74# S VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.31e+11p pd=2.23e+06u as=0p ps=0u
-M1007 a_114_74# S VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1008 a_399_368# A1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND S a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_426_74# A0 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_225_74# S VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_223_368# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Y A1 a_399_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_114_74# a_426_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_114_74# a_399_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y A1 a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR S a_114_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 VGND S a_114_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_223_368# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.cdl b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.cdl
index 7938163..3ec13bc 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.cdl
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__mux2i_2 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 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
-MMNA01 smdNA0 Sb 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
-MMNA10 Y A1 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
-MMNA11 sndNA1 S 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
-MMIN1 Sb S VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB 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
-MMPA01 sndPS A0 VPB 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
-MMPA10 VPWR Sb VPB 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
-MMPA11 sndPSb A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb 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
-MMIP1 Sb S VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 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
+MMNA11 sndNA1 S 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
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB 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
+MMPA01 sndPS A0 VPB 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
+MMPA10 VPWR Sb VPB 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
+MMPA11 sndPSb A1 VPB 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
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=1.0 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_ls__mux2i_2
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.netlist.tsv b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.netlist.tsv
index 7c1d16b..3174b85 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__mux2i_2	A0:I A1:I S: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
-MMNA00	MOSFET	Y	A0	smdNA0	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.spice b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.spice
index 75a7185..0e2a650 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.spice
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__mux2i_2 A0 A1 S VGND VNB VPB VPWR Y
-M1000 VGND a_922_72# a_115_74# VNB nshort w=740000u l=150000u
-+  ad=1.10195e+12p pd=8.18e+06u as=5.18e+11p ps=4.36e+06u
-M1001 Y A1 a_340_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.1984e+12p pd=8.86e+06u as=1.0976e+12p ps=6.44e+06u
-M1002 a_337_74# A1 Y VNB nshort w=740000u l=150000u
-+  ad=7.8555e+11p pd=5.15e+06u as=8.4255e+11p ps=6.93e+06u
-M1003 a_118_368# A0 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.168e+11p pd=5.76e+06u as=0p ps=0u
-M1004 a_340_368# a_922_72# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.66242e+12p ps=1.032e+07u
-M1005 VPWR a_922_72# a_340_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_115_74# A0 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A0 a_118_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR S a_118_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_922_72# S VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1010 a_340_368# A1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_337_74# S VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_118_368# S VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND S a_337_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A1 a_337_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A0 a_115_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_115_74# a_922_72# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_922_72# S VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
+X0 a_115_74# a_922_72# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_337_74# S VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND a_922_72# a_115_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y A1 a_340_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_115_74# A0 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND S a_922_72# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VGND S a_337_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_340_368# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR S a_922_72# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 Y A0 a_115_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_337_74# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y A0 a_118_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_118_368# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR a_922_72# a_340_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Y A1 a_337_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_118_368# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VPWR S a_118_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_340_368# a_922_72# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.cdl b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.cdl
index 1cba81f..be7471f 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.cdl
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__mux2i_4 A0 A1 S VGND VNB VPB VPWR Y
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNA00 Y A0 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 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
-MMNA01 smdNA0 Sb 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
-MMNA10 Y A1 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
-MMNA11 sndNA1 S 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
-MMIN1 Sb S 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
-MMPA00 VPWR S VPB phighvt 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
-MMPA01 sndPS A0 VPB phighvt 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
-MMPA10 VPWR Sb VPB phighvt 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
-MMPA11 sndPSb A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb 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
-MMIP1 Sb S VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 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
+MMNA11 sndNA1 S 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
+MMIN1 Sb S 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
+MMPA00 VPWR S VPB 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
+MMPA01 sndPS A0 VPB 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
+MMPA10 VPWR Sb VPB 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
+MMPA11 sndPSb A1 VPB 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
+MMIP1 Sb S VPB pfet_01v8_hvt m=2 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
 .ENDS sky130_fd_sc_ls__mux2i_4
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.netlist.tsv b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.netlist.tsv
index 3f1fd33..77633a2 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__mux2i_4	A0:I A1:I S: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
-MMNA00	MOSFET	Y	A0	smdNA0	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.spice b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.spice
index 9f81b4a..e3d33ad 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.spice
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.spice
@@ -16,74 +16,39 @@
 
 
 .subckt sky130_fd_sc_ls__mux2i_4 A0 A1 S VGND VNB VPB VPWR Y
-M1000 Y A1 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.792e+12p pd=1.44e+07u as=1.4336e+12p ps=1.152e+07u
-M1001 a_478_368# A0 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4448e+12p pd=1.154e+07u as=0p ps=0u
-M1002 a_116_368# a_1030_268# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=2.5466e+12p ps=1.762e+07u
-M1003 VPWR S a_478_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_475_85# A0 Y VNB nshort w=740000u l=150000u
-+  ad=8.806e+11p pd=8.3e+06u as=1.0767e+12p ps=1.031e+07u
-M1005 a_114_85# S VGND VNB nshort w=740000u l=150000u
-+  ad=8.917e+11p pd=8.33e+06u as=1.795e+12p ps=1.331e+07u
-M1006 a_475_85# a_1030_268# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_1030_268# a_475_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_478_368# S VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_114_85# S VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A0 a_478_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_114_85# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A1 a_114_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1030_268# S VGND VNB nshort w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1014 a_116_368# A1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A1 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR S a_478_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1030_268# S VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1018 a_116_368# a_1030_268# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND S a_114_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_478_368# A0 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_1030_268# a_475_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND S a_114_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_1030_268# a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_475_85# a_1030_268# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_116_368# A1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR S a_1030_268# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A0 a_475_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A0 a_475_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A0 a_478_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1030_268# a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_475_85# A0 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y A1 a_114_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_478_368# S VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_114_85# A1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_475_85# a_1030_268# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 Y A1 a_114_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND S a_1030_268# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_475_85# A0 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR a_1030_268# a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y A1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y A0 a_478_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR a_1030_268# a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y A0 a_475_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_478_368# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_114_85# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_478_368# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR S a_478_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR S a_1030_268# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 VGND a_1030_268# a_475_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND S a_114_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 Y A1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_114_85# A1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_475_85# a_1030_268# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 Y A0 a_475_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_114_85# S VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 Y A0 a_478_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_475_85# A0 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 Y A1 a_114_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_116_368# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VGND a_1030_268# a_475_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_116_368# a_1030_268# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_116_368# a_1030_268# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_116_368# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_478_368# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_478_368# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 VGND S a_114_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_1030_268# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X33 a_114_85# S VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VPWR S a_478_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_1.cdl b/cells/mux4/sky130_fd_sc_ls__mux4_1.cdl
index eaa7033..8078809 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_1.cdl
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_1.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA01 VGND A0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA10 sndNS0a1 S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA20 sndNS0ba2 S0b VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA21 VGND A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA30 sndNS0a3 S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs1o xb S1b VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs2o xb S1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN1 VGND S1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN2 VGND S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN4 VGND xb 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.028 perim=0.76
-MMPA00 sndPA0a0 A0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA01 xlowb S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA10 sndPA1a1 A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA21 VGND A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA11 xlowb S0b VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA30 sndNS0a3 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA21 xhib S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA30 sndPA3a3 A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA31 xhib S0b VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs1o xb S1b VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs1o xb S1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs2o xb S1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs2o xb S1b VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 VGND S1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP1 VPWR S1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 VGND S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP2 VPWR S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 VGND xb 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.028 perim=0.76
-MMIP4 VPWR xb VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA00 sndPA0a0 A0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA01 xlowb S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA10 sndPA1a1 A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA11 xlowb S0b VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA20 sndPA2a2 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA21 xhib S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA30 sndPA3a3 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA31 xhib S0b VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs1o xb S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs2o xb S1b VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP1 VPWR S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP2 VPWR S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP4 VPWR xb VPB 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.028 perim=0.76
 .ENDS sky130_fd_sc_ls__mux4_1
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_1.netlist.tsv b/cells/mux4/sky130_fd_sc_ls__mux4_1.netlist.tsv
index 29bdefa..5bd866a 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_1.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_1.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_ls__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	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_1.spice b/cells/mux4/sky130_fd_sc_ls__mux4_1.spice
index 540408b..f463617 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_1.spice
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_1.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_ls__mux4_1 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 VGND A1 a_450_74# VNB nshort w=640000u l=150000u
-+  ad=1.2058e+12p pd=9.01e+06u as=4.8e+11p ps=2.78e+06u
-M1001 a_979_74# S0 a_846_74# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=7.84075e+11p ps=5.5e+06u
-M1002 VPWR S1 a_1396_99# VPB phighvt w=1e+06u l=150000u
-+  ad=1.97737e+12p pd=1.275e+07u as=3.45e+11p ps=2.69e+06u
-M1003 a_1338_125# S1 a_846_74# VNB nshort w=640000u l=150000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1004 a_255_341# A0 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=8.1e+11p pd=3.62e+06u as=0p ps=0u
-M1005 VGND S1 a_1396_99# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1006 a_763_341# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.9525e+11p pd=3.17e+06u as=0p ps=0u
-M1007 a_264_74# A0 VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1008 a_342_74# a_27_74# a_264_74# VNB nshort w=640000u l=150000u
-+  ad=4.32e+11p pd=3.91e+06u as=0p ps=0u
-M1009 a_342_74# S0 a_255_341# VPB phighvt w=1e+06u l=150000u
-+  ad=5.95e+11p pd=5.19e+06u as=0p ps=0u
-M1010 X a_1338_125# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.472e+11p pd=2.86e+06u as=0p ps=0u
-M1011 VPWR S0 a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1012 X a_1338_125# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 a_846_74# S0 a_763_341# VPB phighvt w=1e+06u l=150000u
-+  ad=1.2e+12p pd=6.4e+06u as=0p ps=0u
-M1014 a_1338_125# S1 a_342_74# VPB phighvt w=1e+06u l=150000u
-+  ad=3.5e+11p pd=2.7e+06u as=0p ps=0u
-M1015 VPWR A3 a_1065_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1016 a_537_341# a_27_74# a_342_74# VPB phighvt w=1e+06u l=150000u
-+  ad=3.6e+11p pd=2.72e+06u as=0p ps=0u
-M1017 VPWR A1 a_537_341# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_450_74# S0 a_342_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1065_387# a_27_74# a_846_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND S0 a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1021 a_846_74# a_27_74# a_768_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1022 a_846_74# a_1396_99# a_1338_125# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_768_74# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_342_74# a_1396_99# a_1338_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A3 a_979_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1396_99# S1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_264_74# a_27_74# a_342_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR A0 a_255_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_342_74# S0 a_450_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_768_74# a_27_74# a_846_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_342_74# S1 a_1338_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_342_74# a_27_74# a_537_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_846_74# S1 a_1338_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND A0 a_264_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_846_74# S0 a_979_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_27_74# S0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_1338_125# a_1396_99# a_846_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VGND A2 a_768_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VGND a_1338_125# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_537_341# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_979_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VPWR a_1338_125# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_763_341# S0 a_846_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_1338_125# a_1396_99# a_342_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_27_74# S0 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_1065_387# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_255_341# S0 a_342_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 a_450_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_1396_99# S1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 VPWR A2 a_763_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_846_74# a_27_74# a_1065_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_2.cdl b/cells/mux4/sky130_fd_sc_ls__mux4_2.cdl
index 0258ee2..c81a88d 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_2.cdl
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_2.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_ls__mux4_2 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 nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b 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.028 perim=0.76
-MMNA01 VGND A0 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.028 perim=0.76
-MMNA10 sndNS0a1 S0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 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.028 perim=0.76
-MMNA11 VGND A1 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.028 perim=0.76
-MMNA20 sndNS0ba2 S0b VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 S0 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.028 perim=0.76
-MMNA21 VGND A2 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.028 perim=0.76
-MMNA30 sndNS0a3 S0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 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.028 perim=0.76
-MMNA31 VGND A3 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.028 perim=0.76
-MMNs1o xb S1b 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.028 perim=0.76
-MMNs2o xb S1 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.028 perim=0.76
-MMIN1 VGND S1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN2 VGND S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN4 VGND xb 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.028 perim=0.76
-MMPA00 sndPA0a0 A0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b 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.028 perim=0.76
-MMPA01 xlowb S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA10 sndPA1a1 A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA21 VGND A2 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.028 perim=0.76
-MMPA11 xlowb S0b VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA30 sndNS0a3 S0 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.028 perim=0.76
-MMPA21 xhib S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA30 sndPA3a3 A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA31 VGND A3 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.028 perim=0.76
-MMPA31 xhib S0b VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs1o xb S1b 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.028 perim=0.76
-MMPs1o xb S1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs2o xb S1 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.028 perim=0.76
-MMPs2o xb S1b VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 VGND S1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP1 VPWR S1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 VGND S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIP2 VPWR S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 VGND xb 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.028 perim=0.76
-MMIP4 VPWR xb VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA00 sndPA0a0 A0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA01 xlowb S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA10 sndPA1a1 A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA11 xlowb S0b VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA20 sndPA2a2 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA21 xhib S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA30 sndPA3a3 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA31 xhib S0b VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs1o xb S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs2o xb S1b VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP1 VPWR S1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP2 VPWR S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP4 VPWR xb VPB 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.028 perim=0.76
 .ENDS sky130_fd_sc_ls__mux4_2
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_2.netlist.tsv b/cells/mux4/sky130_fd_sc_ls__mux4_2.netlist.tsv
index 94bf57b..0d02741 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_2.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_2.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_ls__mux4_2	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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_2.spice b/cells/mux4/sky130_fd_sc_ls__mux4_2.spice
index 1bc735a..f278930 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_2.spice
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__mux4_2 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 VPWR A2 a_1152_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.3796e+12p pd=1.51e+07u as=2.7e+11p ps=2.54e+06u
-M1001 VPWR S0 a_31_94# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1002 a_1152_392# S0 a_909_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=8.3e+11p ps=5.66e+06u
-M1003 VPWR A0 a_618_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1004 a_1047_74# a_31_94# a_909_74# VNB nshort w=740000u l=150000u
-+  ad=5.772e+11p pd=3.04e+06u as=6.068e+11p ps=4.6e+06u
-M1005 X a_1429_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1006 a_264_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=9e+11p pd=3.8e+06u as=0p ps=0u
-M1007 a_333_74# a_1500_94# a_1429_74# VNB nshort w=740000u l=150000u
-+  ad=7.437e+11p pd=4.97e+06u as=3.0295e+11p ps=2.65e+06u
-M1008 VGND S1 a_1500_94# VNB nshort w=640000u l=150000u
-+  ad=1.6907e+12p pd=1.216e+07u as=2.76725e+11p ps=2.15e+06u
-M1009 a_1429_74# S1 a_909_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_618_392# S0 a_333_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=8.9e+11p ps=5.78e+06u
-M1011 a_333_74# S0 a_255_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1012 VGND A2 a_1047_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_255_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_507_74# a_31_94# a_333_74# VNB nshort w=740000u l=150000u
-+  ad=5.772e+11p pd=3.04e+06u as=0p ps=0u
-M1015 a_909_74# S0 a_831_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.776e+11p ps=1.96e+06u
-M1016 a_909_74# a_31_94# a_840_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=7.2e+11p ps=3.44e+06u
-M1017 a_831_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_1429_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1019 a_333_74# a_31_94# a_264_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1429_74# S1 a_333_74# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1021 VGND A0 a_507_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_1429_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR S1 a_1500_94# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=4.25e+11p ps=2.85e+06u
-M1024 a_840_392# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_909_74# a_1500_94# a_1429_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND S0 a_31_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1027 VPWR a_1429_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_264_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 X a_1429_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_1500_94# S1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_31_94# S0 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_333_74# a_31_94# a_507_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 X a_1429_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_31_94# S0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_264_392# a_31_94# a_333_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_831_74# S0 a_909_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_1429_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND a_1429_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_1429_74# a_1500_94# a_909_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_1500_94# S1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VGND A1 a_255_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_840_392# a_31_94# a_909_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_1047_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR A3 a_840_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_333_74# S0 a_618_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_1152_392# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_909_74# S1 a_1429_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_333_74# S1 a_1429_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_507_74# A0 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_1429_74# a_1500_94# a_333_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_909_74# S0 a_1152_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X24 a_909_74# a_31_94# a_1047_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_618_392# A0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 VGND A3 a_831_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_255_74# S0 a_333_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_4.cdl b/cells/mux4/sky130_fd_sc_ls__mux4_4.cdl
index 49f412e..1f36040 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_4.cdl
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_4.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_ls__mux4_4 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 nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA01 VGND A0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA10 sndNS0a1 S0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA20 sndNS0ba2 S0b VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 S0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA21 VGND A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA30 sndNS0a3 S0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs1o xb S1b VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMNs2o xb S1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN1 VGND S1 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.028 perim=0.76
-MMIN2 VGND S0 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.028 perim=0.76
-MMIN4 VGND xb 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.028 perim=0.76
-MMPA00 sndPA0a0 A0 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA01 xlowb S0 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA10 sndPA1a1 A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA21 VGND A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA11 xlowb S0b VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA30 sndNS0a3 S0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA21 xhib S0 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA30 sndPA3a3 A3 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMPA31 xhib S0b VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs1o xb S1b VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs1o xb S1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs2o xb S1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMPs2o xb S1b VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 VGND S1 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.028 perim=0.76
-MMIP1 VPWR S1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 VGND S0 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.028 perim=0.76
-MMIP2 VPWR S0 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 VGND xb 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.028 perim=0.76
-MMIP4 VPWR xb VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA00 sndPA0a0 A0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA01 xlowb S0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA10 sndPA1a1 A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA11 xlowb S0b VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA20 sndPA2a2 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA21 xhib S0 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA30 sndPA3a3 A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA31 xhib S0b VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs1o xb S1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMPs2o xb S1b VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MMIP1 VPWR S1 VPB 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.028 perim=0.76
+MMIP2 VPWR S0 VPB 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.028 perim=0.76
+MMIP4 VPWR xb VPB 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.028 perim=0.76
 .ENDS sky130_fd_sc_ls__mux4_4
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_4.netlist.tsv b/cells/mux4/sky130_fd_sc_ls__mux4_4.netlist.tsv
index 6766c23..0493099 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_4.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_4.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_ls__mux4_4	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	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_4.spice b/cells/mux4/sky130_fd_sc_ls__mux4_4.spice
index 5b8b88e..094852c 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_4.spice
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_4.spice
@@ -16,108 +16,56 @@
 
 
 .subckt sky130_fd_sc_ls__mux4_4 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 a_296_392# A0 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.75e+11p pd=5.35e+06u as=3.70125e+12p ps=2.87e+07u
-M1001 a_2199_74# S1 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=9.9e+11p pd=7.98e+06u as=1.28e+12p ps=1.056e+07u
-M1002 a_1191_121# a_758_306# a_1278_121# VNB nshort w=640000u l=150000u
-+  ad=9.2755e+11p pd=8.21e+06u as=3.584e+11p ps=3.68e+06u
-M1003 a_296_392# S0 a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_509_392# S0 a_114_126# VNB nshort w=640000u l=150000u
-+  ad=8.5705e+11p pd=8.11e+06u as=3.872e+11p ps=3.77e+06u
-M1005 a_1191_121# S0 a_1465_377# VPB phighvt w=1e+06u l=150000u
-+  ad=1.24e+12p pd=1.048e+07u as=6e+11p ps=5.2e+06u
-M1006 a_1450_121# S0 a_1191_121# VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1007 a_1465_377# A2 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A0 a_296_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_2199_74# a_2489_347# a_509_392# VNB nshort w=640000u l=150000u
-+  ad=8.576e+11p pd=6.52e+06u as=0p ps=0u
-M1010 VGND S1 a_2489_347# VNB nshort w=740000u l=150000u
-+  ad=2.4642e+12p pd=2.151e+07u as=2.109e+11p ps=2.05e+06u
-M1011 a_1191_121# a_2489_347# a_2199_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND S0 a_758_306# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1013 a_1191_121# S1 a_2199_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1450_121# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_2199_74# S1 a_1191_121# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_2199_74# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1017 VPWR A2 a_1465_377# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1278_121# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1285_377# a_758_306# a_1191_121# VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1020 a_2199_74# a_2489_347# a_1191_121# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_299_126# A0 VGND VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1022 VGND A0 a_299_126# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_116_392# a_758_306# a_509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=0p ps=0u
-M1024 VPWR a_2199_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1025 VGND A1 a_114_126# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_2199_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A3 a_1450_121# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_114_126# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_2199_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR S0 a_758_306# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1031 a_1191_121# a_758_306# a_1285_377# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_2199_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR A3 a_1285_377# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_2199_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_509_392# a_758_306# a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_299_126# a_758_306# a_509_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR S1 a_2489_347# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.696e+11p ps=2.9e+06u
-M1038 VGND A2 a_1278_121# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A1 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1191_121# S0 a_1450_121# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_116_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_509_392# a_758_306# a_299_126# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_509_392# S0 a_296_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_509_392# S1 a_2199_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1465_377# S0 a_1191_121# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1285_377# A3 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_114_126# S0 a_509_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_509_392# a_2489_347# a_2199_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR a_2199_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 X a_2199_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_1278_121# a_758_306# a_1191_121# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_2199_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_2199_74# a_2489_347# a_1191_121# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_299_126# A0 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VGND A3 a_1450_121# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 X a_2199_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_509_392# a_758_306# a_299_126# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_2489_347# S1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND a_2199_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_1278_121# a_758_306# a_1191_121# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_1191_121# S0 a_1465_377# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_758_306# S0 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_1450_121# S0 a_1191_121# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_509_392# S0 a_114_126# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_1191_121# a_758_306# a_1285_377# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_1191_121# a_2489_347# a_2199_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_296_392# S0 a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_509_392# a_758_306# a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_1465_377# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_114_126# S0 a_509_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_2489_347# S1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 X a_2199_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR A0 a_296_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 a_299_126# a_758_306# a_509_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_1191_121# S0 a_1450_121# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 X a_2199_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VPWR a_2199_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VGND a_2199_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 VGND A1 a_114_126# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 a_2199_74# S1 a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 a_1450_121# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 VPWR A1 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X31 a_296_392# A0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X32 a_509_392# S0 a_296_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X33 a_1465_377# S0 a_1191_121# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X34 VPWR A3 a_1285_377# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X35 a_1285_377# a_758_306# a_1191_121# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X36 a_116_392# a_758_306# a_509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X37 VGND A2 a_1278_121# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 VGND A0 a_299_126# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X39 X a_2199_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X40 a_1278_121# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X41 a_2199_74# a_2489_347# a_509_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X42 a_509_392# a_2489_347# a_2199_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X43 a_509_392# S1 a_2199_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X44 a_1191_121# S1 a_2199_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X45 a_758_306# S0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X46 VPWR A2 a_1465_377# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X47 a_1191_121# a_758_306# a_1278_121# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X48 a_116_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X49 a_114_126# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X50 a_1285_377# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X51 a_2199_74# S1 a_1191_121# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_1.cdl b/cells/nand2/sky130_fd_sc_ls__nand2_1.cdl
index 0bddf67..6e2f71d 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_1.cdl
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y 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
+MMN1 sndA B 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_ls__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_1.netlist.tsv b/cells/nand2/sky130_fd_sc_ls__nand2_1.netlist.tsv
index 6b5e59b..fb436ae 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_1.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	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/nand2/sky130_fd_sc_ls__nand2_1.spice b/cells/nand2/sky130_fd_sc_ls__nand2_1.spice
index 6e5cc58..c170f1a 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_1.spice
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ls__nand2_1 A B VGND VNB VPB VPWR Y
-M1000 Y A a_117_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.776e+11p ps=1.96e+06u
-M1001 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=6.384e+11p ps=5.62e+06u
-M1002 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_117_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_117_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND B a_117_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_2.cdl b/cells/nand2/sky130_fd_sc_ls__nand2_2.cdl
index 77b6eb4..086ac5f 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_2.cdl
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__nand2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y 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
+MMN1 sndA B 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
 .ENDS sky130_fd_sc_ls__nand2_2
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_2.netlist.tsv b/cells/nand2/sky130_fd_sc_ls__nand2_2.netlist.tsv
index 89005b7..d8c8797 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_2.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__nand2_2	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_2.spice b/cells/nand2/sky130_fd_sc_ls__nand2_2.spice
index 4e09185..0811342 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_2.spice
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__nand2_2 A B VGND VNB VPB VPWR Y
-M1000 Y A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.442e+11p pd=2.14e+06u as=6.438e+11p ps=6.18e+06u
-M1001 a_27_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.008e+12p ps=8.52e+06u
-M1003 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.442e+11p ps=2.14e+06u
-M1006 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_4.cdl b/cells/nand2/sky130_fd_sc_ls__nand2_4.cdl
index 6ea6a0c..eb5e147 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_4.cdl
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__nand2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMN0 Y A 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
-MMN1 sndA B VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A 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
+MMN1 sndA B 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
 .ENDS sky130_fd_sc_ls__nand2_4
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_4.netlist.tsv b/cells/nand2/sky130_fd_sc_ls__nand2_4.netlist.tsv
index a3331e8..bd7e480 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_4.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__nand2_4	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_4.spice b/cells/nand2/sky130_fd_sc_ls__nand2_4.spice
index 14b2633..72cf1c5 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_4.spice
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__nand2_4 A B VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.7496e+12p pd=9.39e+06u as=1.1144e+12p ps=8.71e+06u
-M1001 Y A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=5.365e+11p pd=4.41e+06u as=1.1581e+12p ps=1.053e+07u
-M1002 a_27_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1004 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_8.cdl b/cells/nand2/sky130_fd_sc_ls__nand2_8.cdl
index c08311f..d4fa0e4 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_8.cdl
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__nand2_8 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMN0 Y A VNB nshort m=8 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
-MMN1 sndA B VNB nshort m=8 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=8 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
+MMN1 sndA B VNB nfet_01v8 m=8 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_ls__nand2_8
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_8.netlist.tsv b/cells/nand2/sky130_fd_sc_ls__nand2_8.netlist.tsv
index a796c74..69890cb 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_8.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__nand2_8	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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	8	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_8.spice b/cells/nand2/sky130_fd_sc_ls__nand2_8.spice
index 808e651..29e73db 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_8.spice
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__nand2_8 A B VGND VNB VPB VPWR Y
-M1000 VGND B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=1.0656e+12p pd=8.8e+06u as=2.14795e+12p ps=1.918e+07u
-M1001 a_27_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=8.288e+11p ps=8.16e+06u
-M1002 a_27_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=5.1352e+12p pd=2.261e+07u as=1.456e+12p ps=1.156e+07u
-M1004 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 Y A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_27_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.cdl b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.cdl
index 7d802c0..2dfe91c 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.cdl
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nand2b_1 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMN0 Y 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nand2b_1
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.netlist.tsv b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.netlist.tsv
index 72aef37..e30b077 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nand2b_1	A_N: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.spice b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.spice
index f2aff5f..64ee7d8 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.spice
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__nand2b_1 A_N B VGND VNB VPB VPWR Y
-M1000 a_269_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=4.4825e+11p ps=2.73e+06u
-M1001 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.92e+11p pd=2.94e+06u as=8.932e+11p ps=6.12e+06u
-M1002 VGND A_N a_27_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1003 VPWR A_N a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1004 VPWR a_27_112# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_27_112# a_269_74# VNB nshort w=740000u l=150000u
-+  ad=3.182e+11p pd=2.34e+06u as=0p ps=0u
+X0 Y a_27_112# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_27_112# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_269_74# a_27_112# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_112# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 VGND B a_269_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.cdl b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.cdl
index 9cedda9..cab7a6c 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.cdl
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nand2b_2 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB 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
-MMN1 sndA B VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMIN0 A A_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nand2b_2
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.netlist.tsv b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.netlist.tsv
index d813d8e..edf7233 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nand2b_2	A_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.spice b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.spice
index 9421807..e321ef3 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.spice
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__nand2b_2 A_N B VGND VNB VPB VPWR Y
-M1000 VPWR a_27_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.589e+12p pd=9.61e+06u as=6.72e+11p ps=5.68e+06u
-M1001 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B a_242_74# VNB nshort w=740000u l=150000u
-+  ad=3.7765e+11p pd=3.86e+06u as=6.2445e+11p ps=6.14e+06u
-M1003 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_27_74# a_242_74# VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 a_242_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A_N a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1007 Y a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A_N a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1009 a_242_74# a_27_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR a_27_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_242_74# a_27_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y a_27_74# a_242_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND B a_242_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_242_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.cdl b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.cdl
index b21459a..6d4bb1e 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.cdl
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nand2b_4 A_N B VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMIP0 A A_N VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=2 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
+MMN0 Y A 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
-MMN0 Y A 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
-MMN1 sndA B VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMIN0 A A_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N 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_ls__nand2b_4
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.netlist.tsv b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.netlist.tsv
index 65d216e..01d2b1d 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nand2b_4	A_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	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/nand2b/sky130_fd_sc_ls__nand2b_4.spice b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.spice
index fe0404e..96f9ffb 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.spice
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_ls__nand2b_4 A_N B VGND VNB VPB VPWR Y
-M1000 VGND B a_243_74# VNB nshort w=740000u l=150000u
-+  ad=1.0286e+12p pd=7.22e+06u as=1.0434e+12p ps=1.022e+07u
-M1001 Y a_31_74# a_243_74# VNB nshort w=740000u l=150000u
-+  ad=5.143e+11p pd=4.35e+06u as=0p ps=0u
-M1002 Y a_31_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.12e+12p pd=6.48e+06u as=3.0716e+12p ps=1.425e+07u
-M1003 a_243_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B a_243_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_243_74# a_31_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A_N a_31_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1008 a_31_74# A_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1009 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_243_74# a_31_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_31_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A_N a_31_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_31_74# a_243_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_243_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_31_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_243_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND B a_243_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y a_31_74# a_243_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_243_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y a_31_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR A_N a_31_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 Y a_31_74# a_243_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_243_74# a_31_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_31_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR a_31_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_243_74# a_31_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND B a_243_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_1.cdl b/cells/nand3/sky130_fd_sc_ls__nand3_1.cdl
index accab1c..756b0bc 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_1.cdl
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y 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
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
+MMN2 sndB C 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_ls__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_1.netlist.tsv b/cells/nand3/sky130_fd_sc_ls__nand3_1.netlist.tsv
index df541b1..a6bd6f9 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_1.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	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/nand3/sky130_fd_sc_ls__nand3_1.spice b/cells/nand3/sky130_fd_sc_ls__nand3_1.spice
index aa604f0..c9951c3 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_1.spice
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__nand3_1 A B C VGND VNB VPB VPWR Y
-M1000 a_233_74# B a_155_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=1.776e+11p ps=1.96e+06u
-M1001 a_155_74# C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1002 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.664e+11p pd=5.67e+06u as=8.904e+11p ps=6.07e+06u
-M1003 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A a_233_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_155_74# B a_233_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_233_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND C a_155_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_2.cdl b/cells/nand3/sky130_fd_sc_ls__nand3_2.cdl
index aa80685..7980205 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_2.cdl
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nand3_2 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y 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
-MMN2 sndB C VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
+MMN2 sndB C 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
 .ENDS sky130_fd_sc_ls__nand3_2
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_2.netlist.tsv b/cells/nand3/sky130_fd_sc_ls__nand3_2.netlist.tsv
index e88b44e..7a00dc7 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_2.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nand3_2	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_2.spice b/cells/nand3/sky130_fd_sc_ls__nand3_2.spice
index 886fa4d..a3758a3 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_2.spice
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__nand3_2 A B C VGND VNB VPB VPWR Y
-M1000 a_283_74# A Y VNB nshort w=740000u l=150000u
-+  ad=7.123e+11p pd=5.5e+06u as=2.072e+11p ps=2.04e+06u
-M1001 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0136e+12p pd=8.53e+06u as=1.4392e+12p ps=1.153e+07u
-M1002 a_283_74# B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=6.068e+11p ps=6.08e+06u
-M1003 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_74# B a_283_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1008 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A a_283_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_283_74# B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND C a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_74# B a_283_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_27_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_283_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y A a_283_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_4.cdl b/cells/nand3/sky130_fd_sc_ls__nand3_4.cdl
index bcb8db3..691dbf9 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_4.cdl
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nand3_4 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMN0 Y A 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
-MMN1 sndA B VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A 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
-MMN2 sndB C VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
+MMN2 sndB C 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
 .ENDS sky130_fd_sc_ls__nand3_4
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_4.netlist.tsv b/cells/nand3/sky130_fd_sc_ls__nand3_4.netlist.tsv
index 7b49de7..8a3b32c 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_4.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nand3_4	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_4.spice b/cells/nand3/sky130_fd_sc_ls__nand3_4.spice
index dfe82f5..0ad57da 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_4.spice
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__nand3_4 A B C VGND VNB VPB VPWR Y
-M1000 a_456_82# C VGND VNB nshort w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=6.142e+11p ps=6.1e+06u
-M1001 VGND C a_456_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.6904e+12p pd=1.555e+07u as=1.5904e+12p ps=9.56e+06u
-M1003 a_27_82# B a_456_82# VNB nshort w=740000u l=150000u
-+  ad=1.0121e+12p pd=1.018e+07u as=0p ps=0u
-M1004 a_456_82# B a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A a_27_82# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C a_456_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_82# B a_456_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_456_82# C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_82# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_456_82# B a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_82# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_82# B a_456_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_82# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_456_82# B a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_456_82# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND C a_456_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_456_82# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y A a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_27_82# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y A a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_27_82# B a_456_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_456_82# B a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND C a_456_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.cdl b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.cdl
index 05feb90..0d3a1b5 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.cdl
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nand3b_1 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMN0 Y 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nand3b_1
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.netlist.tsv b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.netlist.tsv
index d43a03c..d8c7967 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nand3b_1	A_N: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.spice b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.spice
index 55ab02f..8887709 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.spice
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__nand3b_1 A_N B C VGND VNB VPB VPWR Y
-M1000 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.664e+11p pd=5.67e+06u as=9.1e+11p ps=6.15e+06u
-M1001 Y a_27_116# a_347_78# VNB nshort w=740000u l=150000u
-+  ad=3.404e+11p pd=2.4e+06u as=2.886e+11p ps=2.26e+06u
-M1002 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A_N a_27_116# VNB nshort w=550000u l=150000u
-+  ad=4.4825e+11p pd=2.73e+06u as=1.5675e+11p ps=1.67e+06u
-M1004 Y a_27_116# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A_N a_27_116# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1006 a_269_78# C VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1007 a_347_78# B a_269_78# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_116# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR a_27_116# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_269_78# B a_347_78# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_347_78# a_27_116# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_116# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND C a_269_78# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.cdl b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.cdl
index 31685c1..13873f4 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.cdl
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nand3b_2 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB 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
-MMN1 sndA B VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN2 sndB C VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMIN0 A A_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nand3b_2
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.netlist.tsv b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.netlist.tsv
index beb7f70..c9a952d 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nand3b_2	A_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.spice b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.spice
index c24ca4a..00cd5b7 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.spice
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__nand3b_2 A_N B C VGND VNB VPB VPWR Y
-M1000 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.1256e+12p pd=8.73e+06u as=1.6804e+12p ps=1.198e+07u
-M1001 a_206_74# C VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=4.2745e+11p ps=4.18e+06u
-M1002 VPWR A_N a_27_94# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1003 VGND A_N a_27_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1004 Y a_27_94# a_403_54# VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.1145e+11p ps=7.38e+06u
-M1005 a_403_54# a_27_94# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C a_206_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_27_94# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_206_74# B a_403_54# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_403_54# B a_206_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_27_94# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_94# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y a_27_94# a_403_54# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_27_94# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND C a_206_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_206_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_27_94# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_403_54# B a_206_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_403_54# a_27_94# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_206_74# B a_403_54# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 Y a_27_94# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.cdl b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.cdl
index f829b6a..b4ed2ca 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.cdl
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nand3b_4 A_N B C VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMIP0 A A_N VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=2 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
+MMN0 Y A 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
-MMN0 Y A 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
-MMN1 sndA B VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN2 sndB C VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMIN0 A A_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N 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_ls__nand3b_4
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.netlist.tsv b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.netlist.tsv
index 9c17b9e..a024ae5 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nand3b_4	A_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	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/nand3b/sky130_fd_sc_ls__nand3b_4.spice b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.spice
index 35a181f..14e5c72 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.spice
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.spice
@@ -16,46 +16,25 @@
 
 
 .subckt sky130_fd_sc_ls__nand3b_4 A_N B C VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_89_172# VPB phighvt w=840000u l=150000u
-+  ad=4.9686e+12p pd=1.99e+07u as=2.52e+11p ps=2.28e+06u
-M1001 a_744_74# B a_297_82# VNB nshort w=740000u l=150000u
-+  ad=1.0672e+12p pd=1.036e+07u as=8.806e+11p ps=8.3e+06u
-M1002 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4336e+12p pd=9.28e+06u as=0p ps=0u
-M1003 a_297_82# C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.1492e+12p ps=8.02e+06u
-M1004 a_744_74# a_89_172# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.329e+11p ps=4.13e+06u
-M1005 a_744_74# B a_297_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_89_172# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND C a_297_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C a_297_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_297_82# C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_89_172# a_744_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_89_172# a_744_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_297_82# B a_744_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_89_172# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_297_82# B a_744_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_89_172# A_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_744_74# a_89_172# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A_N a_89_172# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.9515e+11p ps=2.05e+06u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND C a_297_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_89_172# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_744_74# a_89_172# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y a_89_172# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_89_172# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_744_74# B a_297_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_297_82# B a_744_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_89_172# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND C a_297_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_297_82# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_297_82# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y a_89_172# a_744_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_744_74# B a_297_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_297_82# B a_744_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_744_74# a_89_172# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR A_N a_89_172# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 Y a_89_172# a_744_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_1.cdl b/cells/nand4/sky130_fd_sc_ls__nand4_1.cdl
index 28f951d..2905b2c 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_1.cdl
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4_1 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP3 Y D VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMP2 Y C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y 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
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN3 sndC D VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
+MMN3 sndC D 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_ls__nand4_1
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_1.netlist.tsv b/cells/nand4/sky130_fd_sc_ls__nand4_1.netlist.tsv
index 09cd079..18dee59 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_1.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nand4_1	A:I B:I C:I D: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	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/nand4/sky130_fd_sc_ls__nand4_1.spice b/cells/nand4/sky130_fd_sc_ls__nand4_1.spice
index ae859a7..af35f5a 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_1.spice
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__nand4_1 A B C D VGND VNB VPB VPWR Y
-M1000 a_181_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=2.923e+11p ps=2.72e+06u
-M1001 a_259_74# C a_181_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1002 a_373_74# B a_259_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1003 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.28e+11p pd=5.78e+06u as=1.232e+12p ps=8.92e+06u
-M1004 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A a_373_74# VNB nshort w=740000u l=150000u
-+  ad=2.085e+11p pd=2.05e+06u as=0p ps=0u
+X0 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_181_74# C a_259_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_259_74# B a_373_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND D a_181_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_373_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_2.cdl b/cells/nand4/sky130_fd_sc_ls__nand4_2.cdl
index a0abfb2..b8267e9 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_2.cdl
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4_2 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP3 Y D VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y 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
-MMN2 sndB C VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN3 sndC D VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
+MMN3 sndC D 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
 .ENDS sky130_fd_sc_ls__nand4_2
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_2.netlist.tsv b/cells/nand4/sky130_fd_sc_ls__nand4_2.netlist.tsv
index 8d241b4..bbfd517 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_2.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nand4_2	A:I B:I C:I D: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_2.spice b/cells/nand4/sky130_fd_sc_ls__nand4_2.spice
index 4cd452c..8051c29 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_2.spice
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__nand4_2 A B C D VGND VNB VPB VPWR Y
-M1000 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4112e+12p pd=1.148e+07u as=2.268e+12p ps=1.525e+07u
-M1001 a_27_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=6.5035e+11p pd=6.28e+06u as=2.738e+11p ps=2.22e+06u
-M1002 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_515_74# B a_304_74# VNB nshort w=740000u l=150000u
-+  ad=6.2875e+11p pd=6.24e+06u as=4.144e+11p ps=4.08e+06u
-M1005 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_304_74# C a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A a_515_74# VNB nshort w=740000u l=150000u
-+  ad=2.22e+11p pd=2.08e+06u as=0p ps=0u
-M1011 VGND D a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_304_74# B a_515_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# C a_304_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_515_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_515_74# B a_304_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y A a_515_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_304_74# B a_515_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_515_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND D a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_27_74# C a_304_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_304_74# C a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_4.cdl b/cells/nand4/sky130_fd_sc_ls__nand4_4.cdl
index cf806ef..cc41ff5 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_4.cdl
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4_4 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP3 Y D VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMN0 Y A 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
-MMN1 sndA B VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A 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
-MMN2 sndB C VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN3 sndC D VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
+MMN3 sndC D 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
 .ENDS sky130_fd_sc_ls__nand4_4
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_4.netlist.tsv b/cells/nand4/sky130_fd_sc_ls__nand4_4.netlist.tsv
index b60eff9..50c273d 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_4.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nand4_4	A:I B:I C:I D: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_4.spice b/cells/nand4/sky130_fd_sc_ls__nand4_4.spice
index e4e33d4..3fc471a 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_4.spice
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__nand4_4 A B C D VGND VNB VPB VPWR Y
-M1000 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.7888e+12p pd=1.394e+07u as=5.236e+12p ps=2.055e+07u
-M1001 a_554_74# C a_27_74# VNB nshort w=740000u l=150000u
-+  ad=8.288e+11p pd=8.16e+06u as=1.13125e+12p ps=1.05e+07u
-M1002 VPWR A Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A a_923_74# VNB nshort w=740000u l=150000u
-+  ad=5.328e+11p pd=4.4e+06u as=1.0147e+12p ps=1.022e+07u
-M1004 a_923_74# B a_554_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_923_74# B a_554_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D a_27_74# VNB nshort w=740000u l=150000u
-+  ad=6.66e+11p pd=4.76e+06u as=0p ps=0u
-M1008 Y A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# C a_554_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_554_74# C a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_923_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A a_923_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_554_74# B a_923_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND D a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# C a_554_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_554_74# B a_923_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_923_74# A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_554_74# B a_923_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_923_74# B a_554_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_923_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_923_74# B a_554_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_74# C a_554_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_554_74# C a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_554_74# B a_923_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_923_74# A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_27_74# C a_554_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 Y A a_923_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_554_74# C a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 Y A a_923_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_27_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND D a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 VGND D a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.cdl b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.cdl
index e23b62a..35a378f 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.cdl
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4b_1 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMP3 Y D VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMN0 Y 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMN3 sndC D VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D 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
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nand4b_1
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.netlist.tsv b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.netlist.tsv
index ab137a3..165350b 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__nand4b_1	A_N:I B:I C:I D: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.spice b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.spice
index 4d116bc..888caf2 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.spice
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__nand4b_1 A_N B C D VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=1.3188e+12p pd=9.12e+06u as=2.478e+11p ps=2.27e+06u
-M1001 a_443_74# B a_341_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=2.664e+11p ps=2.2e+06u
-M1002 Y a_27_112# a_443_74# VNB nshort w=740000u l=150000u
-+  ad=3.404e+11p pd=2.4e+06u as=0p ps=0u
-M1003 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1004 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_112# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A_N a_27_112# VNB nshort w=550000u l=150000u
-+  ad=2.696e+11p pd=2.26e+06u as=2.695e+11p ps=2.08e+06u
-M1008 a_263_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1009 a_341_74# C a_263_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_112# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_263_74# C a_341_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_341_74# B a_443_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_443_74# a_27_112# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND D a_263_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y a_27_112# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_112# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.cdl b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.cdl
index 364d0bd..fb65536 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.cdl
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4b_2 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMP3 Y D VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB 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
-MMN1 sndA B VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN2 sndB C VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMN3 sndC D VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D 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
-MMIN0 A A_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nand4b_2
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.netlist.tsv b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.netlist.tsv
index 7ca7d47..ca5d063 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__nand4b_2	A_N:I B:I C:I D: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.spice b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.spice
index 93aa1b0..9d42734 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.spice
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__nand4b_2 A_N B C D VGND VNB VPB VPWR Y
-M1000 a_719_123# C a_490_74# VNB nshort w=740000u l=150000u
-+  ad=6.22175e+11p pd=6.14e+06u as=5.618e+11p ps=4.6e+06u
-M1001 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.344e+12p pd=1.136e+07u as=2.5148e+12p ps=1.571e+07u
-M1002 a_225_74# B a_490_74# VNB nshort w=740000u l=150000u
-+  ad=6.01175e+11p pd=6.14e+06u as=0p ps=0u
-M1003 Y a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_225_74# a_27_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.294e+11p ps=2.1e+06u
-M1008 VPWR D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_719_123# D VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=3.946e+11p ps=3.93e+06u
-M1010 VGND D a_719_123# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_490_74# C a_719_123# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_490_74# B a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A_N a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1015 VGND A_N a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1016 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_27_74# a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_225_74# a_27_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_719_123# C a_490_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_490_74# C a_719_123# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y a_27_74# a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_225_74# B a_490_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_490_74# B a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_719_123# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_27_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 VPWR a_27_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_27_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 VGND D a_719_123# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.cdl b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.cdl
index c79daf3..a41ea2d 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.cdl
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4b_4 A_N B C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMP3 Y D VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMIP0 A A_N VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=2 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
+MMN0 Y A 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
-MMN0 Y A 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
-MMN1 sndA B VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN2 sndB C VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMN3 sndC D VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D 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
-MMIN0 A A_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N 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_ls__nand4b_4
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.netlist.tsv b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.netlist.tsv
index 37208dd..70feb9b 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__nand4b_4	A_N:I B:I C:I D: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	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/nand4b/sky130_fd_sc_ls__nand4b_4.spice b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.spice
index 0787bbc..49c28bc 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.spice
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_ls__nand4b_4 A_N B C D VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_27_158# VPB phighvt w=840000u l=150000u
-+  ad=5.0862e+12p pd=2.218e+07u as=2.52e+11p ps=2.28e+06u
-M1001 a_225_74# B a_656_74# VNB nshort w=740000u l=150000u
-+  ad=1.01295e+12p pd=1.022e+07u as=8.399e+11p ps=8.19e+06u
-M1002 a_225_74# a_27_158# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1003 Y B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.2512e+12p pd=1.298e+07u as=0p ps=0u
-M1004 VPWR D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1025_158# D VGND VNB nshort w=740000u l=150000u
-+  ad=1.0287e+12p pd=1.022e+07u as=6.9465e+11p ps=6.36e+06u
-M1006 a_1025_158# C a_656_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_656_74# B a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_158# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_225_74# a_27_158# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1025_158# C a_656_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1025_158# D VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND D a_1025_158# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_225_74# B a_656_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_27_158# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_656_74# B a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_158# A_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A_N a_27_158# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.962e+11p ps=2.05e+06u
-M1021 Y a_27_158# a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_27_158# a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_656_74# C a_1025_158# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_656_74# C a_1025_158# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND D a_1025_158# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_158# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_1025_158# C a_656_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_225_74# a_27_158# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_27_158# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 Y a_27_158# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_656_74# C a_1025_158# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y a_27_158# a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_1025_158# C a_656_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_225_74# a_27_158# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y a_27_158# a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_225_74# B a_656_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_656_74# C a_1025_158# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_656_74# B a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND D a_1025_158# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VPWR A_N a_27_158# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_225_74# B a_656_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_656_74# B a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_1025_158# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_27_158# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VGND D a_1025_158# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_1025_158# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.cdl b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.cdl
index 655e026..a9106d9 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.cdl
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4bb_1 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMP3 Y D VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB 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
+MMIP1 B B_N VPB 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
+MMN0 Y 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
-MMIP1 B B_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMN2 sndB C VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D 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
-MMN3 sndC D VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nand4bb_1
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.netlist.tsv b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.netlist.tsv
index a2206dd..135481e 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__nand4bb_1	A_N:I B_N:I C:I D: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.spice b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.spice
index 31e7443..35520e2 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.spice
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__nand4bb_1 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 a_226_398# B_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.5055e+11p pd=1.69e+06u as=5.10375e+11p ps=4.39e+06u
-M1001 a_513_74# a_226_398# a_435_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=1.776e+11p ps=1.96e+06u
-M1002 VGND A_N a_27_398# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.50975e+11p ps=1.67e+06u
-M1003 VGND D a_627_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=3.108e+11p ps=2.32e+06u
-M1004 Y a_226_398# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0528e+12p pd=8.6e+06u as=1.2768e+12p ps=8.64e+06u
-M1005 a_435_74# a_27_398# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.9585e+11p ps=2.05e+06u
-M1006 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_226_398# B_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1008 VPWR a_27_398# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A_N a_27_398# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1010 a_627_74# C a_513_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_27_398# a_435_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_627_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_226_398# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_435_74# a_226_398# a_513_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND B_N a_226_398# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 VPWR B_N a_226_398# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_513_74# C a_627_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_27_398# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_27_398# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 Y a_27_398# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.cdl b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.cdl
index 9ddd434..ddbb797 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.cdl
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4bb_2 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMP3 Y D VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMIP0 A A_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMN2 sndB C VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D 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
-MMN3 sndC D VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nand4bb_2
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.netlist.tsv b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.netlist.tsv
index 4b53f16..b221154 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__nand4bb_2	A_N:I B_N:I C:I D: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.spice b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.spice
index 3cca4de..6c76b3b 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.spice
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__nand4bb_2 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 a_373_74# a_231_74# a_678_74# VNB nshort w=740000u l=150000u
-+  ad=8.504e+11p pd=6.86e+06u as=4.662e+11p ps=4.22e+06u
-M1001 Y a_231_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.3888e+12p pd=1.144e+07u as=3.0381e+12p ps=1.88e+07u
-M1002 a_231_74# B_N VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=5.278e+11p ps=4.3e+06u
-M1003 a_886_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=6.29e+11p pd=6.14e+06u as=0p ps=0u
-M1004 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND D a_886_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_231_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_373_74# a_27_368# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.257e+11p ps=2.09e+06u
-M1009 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_231_74# B_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.95e+11p pd=2.79e+06u as=0p ps=0u
-M1011 VPWR A_N a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1012 Y a_27_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_886_74# C a_678_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_678_74# a_231_74# a_373_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_27_368# a_373_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_27_368# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A_N a_27_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1019 a_678_74# C a_886_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR B_N a_231_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_886_74# C a_678_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_373_74# a_27_368# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR a_231_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND D a_886_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_27_368# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_678_74# C a_886_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y a_27_368# a_373_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_373_74# a_231_74# a_678_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_678_74# a_231_74# a_373_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_886_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y a_231_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND B_N a_231_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_27_368# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VPWR a_27_368# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.cdl b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.cdl
index 68434cc..221098c 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.cdl
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__nand4bb_4 A_N B_N C D VGND VNB VPB VPWR Y
 *.PININFO A_N:I B_N:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 Y A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB 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
-MMP1 Y B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB 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
-MMP2 Y C VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB 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
-MMP3 Y D VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB 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
-MMIP0 A A_N VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=2 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
+MMIP1 B B_N VPB pfet_01v8_hvt m=2 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
+MMN0 Y A 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
-MMIP1 B B_N VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B 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
-MMN0 Y A 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
-MMN1 sndA B VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C 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
-MMN2 sndB C VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D 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
-MMN3 sndC D VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N 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
-MMIN0 A A_N 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
-MMIN1 B B_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N 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_ls__nand4bb_4
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.netlist.tsv b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.netlist.tsv
index 705afc1..54aaf9b 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__nand4bb_4	A_N:I B_N:I C:I D: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	A	A_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	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/nand4bb/sky130_fd_sc_ls__nand4bb_4.spice b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.spice
index 39bea1c..6c20b6c 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.spice
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ls__nand4bb_4 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 a_374_74# a_27_114# Y VNB nshort w=740000u l=150000u
-+  ad=1.0508e+12p pd=1.024e+07u as=4.921e+11p ps=4.29e+06u
-M1001 VPWR B_N a_232_114# VPB phighvt w=840000u l=150000u
-+  ad=3.9592e+12p pd=3.104e+07u as=2.52e+11p ps=2.28e+06u
-M1002 a_828_74# a_232_114# a_374_74# VNB nshort w=740000u l=150000u
-+  ad=9.53e+11p pd=8.52e+06u as=0p ps=0u
-M1003 a_1229_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=1.0434e+12p pd=1.022e+07u as=9.049e+11p ps=7.36e+06u
-M1004 VPWR a_232_114# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=2.744e+12p ps=2.282e+07u
-M1005 Y a_27_114# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_27_114# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_374_74# a_27_114# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_374_74# a_232_114# a_828_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND D a_1229_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_27_114# a_374_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_1229_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_27_114# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_27_114# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_828_74# a_232_114# a_374_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A_N a_27_114# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1019 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_232_114# B_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.368e+11p pd=2.12e+06u as=0p ps=0u
-M1021 a_828_74# C a_1229_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_232_114# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_828_74# C a_1229_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A_N a_27_114# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1025 Y D VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_114# A_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y C VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_374_74# a_232_114# a_828_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_27_114# a_374_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_232_114# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1229_74# D VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_232_114# B_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y a_232_114# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1229_74# C a_828_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1229_74# C a_828_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_232_114# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR a_27_114# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_114# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR a_232_114# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR a_27_114# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_1229_74# C a_828_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y a_27_114# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y a_27_114# a_374_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_828_74# a_232_114# a_374_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_828_74# C a_1229_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND B_N a_232_114# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_374_74# a_232_114# a_828_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR a_232_114# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VPWR B_N a_232_114# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_828_74# a_232_114# a_374_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_1229_74# C a_828_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 Y a_232_114# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_374_74# a_232_114# a_828_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_828_74# C a_1229_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_1229_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VGND D a_1229_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 Y a_27_114# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_374_74# a_27_114# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 a_374_74# a_27_114# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VPWR A_N a_27_114# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 Y a_27_114# a_374_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 a_27_114# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VGND D a_1229_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 a_1229_74# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 Y a_232_114# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_1.cdl b/cells/nor2/sky130_fd_sc_ls__nor2_1.cdl
index cfadc62..831b790 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_1.cdl
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMN0 Y 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
-MMN1 Y B 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
 .ENDS sky130_fd_sc_ls__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_1.netlist.tsv b/cells/nor2/sky130_fd_sc_ls__nor2_1.netlist.tsv
index 612f82e..fdb8214 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_1.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	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/nor2/sky130_fd_sc_ls__nor2_1.spice b/cells/nor2/sky130_fd_sc_ls__nor2_1.spice
index 86748f5..28dd29b 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_1.spice
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_ls__nor2_1 A B VGND VNB VPB VPWR Y
-M1000 Y B a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=3.024e+11p ps=2.78e+06u
-M1001 a_116_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1002 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=2.072e+11p ps=2.04e+06u
-M1003 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR A a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_116_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_2.cdl b/cells/nor2/sky130_fd_sc_ls__nor2_2.cdl
index 18a3339..177823c 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_2.cdl
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__nor2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMN0 Y 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
-MMN1 Y B 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
 .ENDS sky130_fd_sc_ls__nor2_2
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_2.netlist.tsv b/cells/nor2/sky130_fd_sc_ls__nor2_2.netlist.tsv
index 6a5ba11..8029ff6 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_2.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__nor2_2	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	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/nor2/sky130_fd_sc_ls__nor2_2.spice b/cells/nor2/sky130_fd_sc_ls__nor2_2.spice
index 3ab076f..bb12cfb 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_2.spice
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__nor2_2 A B VGND VNB VPB VPWR Y
-M1000 a_35_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.968e+11p pd=8.5e+06u as=3.36e+11p ps=2.84e+06u
-M1001 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=5.254e+11p ps=4.38e+06u
-M1002 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B a_35_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1004 a_35_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_35_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_35_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A a_35_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y B a_35_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_35_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_4.cdl b/cells/nor2/sky130_fd_sc_ls__nor2_4.cdl
index 2c99382..2a79ed1 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_4.cdl
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__nor2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMN0 Y 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
-MMN1 Y B 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
 .ENDS sky130_fd_sc_ls__nor2_4
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_4.netlist.tsv b/cells/nor2/sky130_fd_sc_ls__nor2_4.netlist.tsv
index 66ae8cb..2510e57 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_4.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__nor2_4	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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_4.spice b/cells/nor2/sky130_fd_sc_ls__nor2_4.spice
index c6ba57c..8b739d4 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_4.spice
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__nor2_4 A B VGND VNB VPB VPWR Y
-M1000 a_27_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.792e+12p pd=1.44e+07u as=6.72e+11p ps=5.68e+06u
-M1001 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=1.4874e+12p pd=8.46e+06u as=1.0656e+12p ps=5.84e+06u
-M1002 Y B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.28e+11p pd=5.78e+06u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_8.cdl b/cells/nor2/sky130_fd_sc_ls__nor2_8.cdl
index 496bdf2..338485b 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_8.cdl
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_ls__nor2_8 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=8 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=8 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
+MMP1 sndPA B VPB pfet_01v8_hvt m=8 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
+MMN0 Y A 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
-MMP1 sndPA B VPB phighvt m=8 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMN0 Y A 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
-MMN1 Y B 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
 .ENDS sky130_fd_sc_ls__nor2_8
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_8.netlist.tsv b/cells/nor2/sky130_fd_sc_ls__nor2_8.netlist.tsv
index 9f1d6c9..3a77eeb 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_8.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_ls__nor2_8	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	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	8	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_8.spice b/cells/nor2/sky130_fd_sc_ls__nor2_8.spice
index 2c14977..f177825 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_8.spice
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__nor2_8 A B VGND VNB VPB VPWR Y
-M1000 a_27_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.1808e+12p pd=2.584e+07u as=1.568e+12p ps=1.176e+07u
-M1001 a_27_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.4e+12p ps=1.146e+07u
-M1002 Y B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=2.1756e+12p pd=1.328e+07u as=1.4393e+12p ps=9.81e+06u
-M1004 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 Y B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_27_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.cdl b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.cdl
index cadeda4..42ea5f0 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.cdl
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nor2b_1 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMIP1 B B_N VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMIP1 B B_N VPB 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
-MMN0 Y 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
-MMN1 Y B 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
-MMIN1 B B_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nor2b_1
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.netlist.tsv b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.netlist.tsv
index e151d26..e6ca87e 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nor2b_1	A:I B_N: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.spice b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.spice
index aa6de6c..40a1af5 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.spice
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__nor2b_1 A B_N VGND VNB VPB VPWR Y
-M1000 Y a_27_112# a_278_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.2e+11p pd=2.99e+06u as=3.024e+11p ps=2.78e+06u
-M1001 VGND a_27_112# Y VNB nshort w=740000u l=150000u
-+  ad=5.6985e+11p pd=4.59e+06u as=2.627e+11p ps=2.19e+06u
-M1002 a_278_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.69e+11p ps=3.16e+06u
-M1003 VPWR B_N a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1004 VGND B_N a_27_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=2.805e+11p ps=2.12e+06u
-M1005 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_112# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 Y a_27_112# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR A a_278_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_112# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_278_368# a_27_112# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.cdl b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.cdl
index 92d3fa3..2c6f036 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.cdl
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nor2b_2 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMIP1 B B_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB 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
-MMN1 Y B 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
-MMIN1 B B_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nor2b_2
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.netlist.tsv b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.netlist.tsv
index b077317..fa3d23e 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nor2b_2	A:I B_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.spice b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.spice
index 73c1433..0e0a2b0 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.spice
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__nor2b_2 A B_N VGND VNB VPB VPWR Y
-M1000 VPWR A a_228_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.31e+11p pd=5.43e+06u as=9.912e+11p ps=8.49e+06u
-M1001 Y a_27_392# VGND VNB nshort w=740000u l=150000u
-+  ad=4.884e+11p pd=4.28e+06u as=7.744e+11p ps=6.56e+06u
-M1002 VGND B_N a_27_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1003 a_228_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_392# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_27_392# a_228_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B_N a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1009 a_228_368# a_27_392# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR A a_228_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND a_27_392# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y a_27_392# a_228_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y a_27_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_392# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_228_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_27_392# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_228_368# a_27_392# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.cdl b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.cdl
index 7f959fc..077d271 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.cdl
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nor2b_4 A B_N VGND VNB VPB VPWR Y
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMIP1 B B_N VPB pfet_01v8_hvt m=2 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMIP1 B B_N VPB phighvt m=2 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
-MMN0 Y 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
-MMN1 Y B 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
-MMIN1 B B_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N 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_ls__nor2b_4
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.netlist.tsv b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.netlist.tsv
index 9bd8b53..e9cf944 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nor2b_4	A:I B_N: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	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/nor2b/sky130_fd_sc_ls__nor2b_4.spice b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.spice
index f966e9f..1581e9f 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.spice
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_ls__nor2b_4 A B_N VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.3489e+12p ps=8.29e+06u
-M1001 Y a_353_323# a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.4e+12p ps=1.146e+07u
-M1002 a_116_368# a_353_323# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y a_353_323# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_353_323# a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_116_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.3762e+12p ps=1.105e+07u
-M1007 VPWR A a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_353_323# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_116_368# a_353_323# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_353_323# B_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1011 a_116_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B_N a_353_323# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_353_323# B_N VGND VNB nshort w=740000u l=150000u
-+  ad=5.18e+11p pd=2.88e+06u as=0p ps=0u
+X0 VPWR B_N a_353_323# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 Y a_353_323# a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y a_353_323# a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR A a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_353_323# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_116_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y a_353_323# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR A a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_353_323# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 a_116_368# a_353_323# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND B_N a_353_323# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_116_368# a_353_323# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_116_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_1.cdl b/cells/nor3/sky130_fd_sc_ls__nor3_1.cdl
index ac541f3..e184074 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_1.cdl
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMN0 Y 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
-MMN1 Y B 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
-MMN2 Y C 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
 .ENDS sky130_fd_sc_ls__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_1.netlist.tsv b/cells/nor3/sky130_fd_sc_ls__nor3_1.netlist.tsv
index deaa922..cda2d77 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_1.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	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/nor3/sky130_fd_sc_ls__nor3_1.spice b/cells/nor3/sky130_fd_sc_ls__nor3_1.spice
index d2bfaf4..e9c68af 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_1.spice
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__nor3_1 A B C VGND VNB VPB VPWR Y
-M1000 Y C a_198_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=4.032e+11p ps=2.96e+06u
-M1001 a_198_368# B a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1002 Y C VGND VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=4.699e+11p ps=4.23e+06u
-M1003 a_114_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.192e+11p ps=2.81e+06u
-M1004 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_368# B a_198_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR A a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_198_368# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_2.cdl b/cells/nor3/sky130_fd_sc_ls__nor3_2.cdl
index cedb4b6..1f18552 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_2.cdl
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nor3_2 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMN0 Y 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
-MMN1 Y B 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
-MMN2 Y C 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
 .ENDS sky130_fd_sc_ls__nor3_2
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_2.netlist.tsv b/cells/nor3/sky130_fd_sc_ls__nor3_2.netlist.tsv
index 63b5b29..ed8cf71 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_2.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nor3_2	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	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/nor3/sky130_fd_sc_ls__nor3_2.spice b/cells/nor3/sky130_fd_sc_ls__nor3_2.spice
index 71df657..5c6296b 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_2.spice
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_2.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_ls__nor3_2 A B C VGND VNB VPB VPWR Y
-M1000 a_306_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.056e+11p pd=5.74e+06u as=3.584e+11p ps=2.88e+06u
-M1001 VPWR A a_306_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_368# B a_306_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.968e+11p pd=8.5e+06u as=0p ps=0u
-M1003 a_27_368# C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.92e+11p ps=2.94e+06u
-M1004 Y C a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_306_368# B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C Y VNB nshort w=740000u l=150000u
-+  ad=9.176e+11p pd=5.44e+06u as=4.699e+11p ps=4.23e+06u
-M1007 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# B a_306_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_306_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_306_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_368# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y C a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A a_306_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_4.cdl b/cells/nor3/sky130_fd_sc_ls__nor3_4.cdl
index 83ab51b..d19256f 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_4.cdl
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__nor3_4 A B C VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMN0 Y 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
-MMN1 Y B 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
-MMN2 Y C 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
 .ENDS sky130_fd_sc_ls__nor3_4
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_4.netlist.tsv b/cells/nor3/sky130_fd_sc_ls__nor3_4.netlist.tsv
index 25afa89..66814fd 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_4.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__nor3_4	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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_4.spice b/cells/nor3/sky130_fd_sc_ls__nor3_4.spice
index 26cdaf6..260f875 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_4.spice
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__nor3_4 A B C VGND VNB VPB VPWR Y
-M1000 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.652e+12p ps=1.415e+07u
-M1001 Y C VGND VNB nshort w=740000u l=150000u
-+  ad=6.29e+11p pd=6.14e+06u as=1.22935e+12p ps=9.25e+06u
-M1002 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND C Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C a_295_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0458e+12p pd=6.56e+06u as=1.9762e+12p ps=1.303e+07u
-M1007 a_295_368# C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# B a_295_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_295_368# C Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_295_368# B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_368# B a_295_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_295_368# B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C a_295_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_295_368# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_295_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_295_368# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_368# B a_295_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y C a_295_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_27_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_27_368# B a_295_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_295_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR A a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Y C a_295_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.cdl b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.cdl
index 62f2c0f..1a61b1b 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.cdl
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nor3b_1 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMIP2 C C_N VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMIP2 C C_N VPB 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
-MMN0 Y 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMIN2 C C_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nor3b_1
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.netlist.tsv b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.netlist.tsv
index f385082..64003ac 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nor3b_1	A:I B:I C_N: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.spice b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.spice
index f08f43c..a7376c2 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.spice
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__nor3b_1 A B C_N VGND VNB VPB VPWR Y
-M1000 Y a_27_112# a_344_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=4.704e+11p ps=3.08e+06u
-M1001 a_344_368# B a_260_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1002 a_260_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.354e+11p ps=3.08e+06u
-M1003 VPWR C_N a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1004 VGND C_N a_27_112# VNB nshort w=550000u l=150000u
-+  ad=5.8515e+11p pd=4.58e+06u as=2.695e+11p ps=2.08e+06u
-M1005 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.477e+11p ps=4.17e+06u
-M1006 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_27_112# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_112# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND a_27_112# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_260_368# B a_344_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR A a_260_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_344_368# a_27_112# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_112# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.cdl b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.cdl
index c577409..c7685dc 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.cdl
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nor3b_2 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMIP2 C C_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMIN2 C C_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nor3b_2
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.netlist.tsv b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.netlist.tsv
index 591fbad..36544c8 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nor3b_2	A:I B:I C_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.spice b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.spice
index 061b6d5..134c0d5 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.spice
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__nor3b_2 A B C_N VGND VNB VPB VPWR Y
-M1000 VGND a_27_392# Y VNB nshort w=740000u l=150000u
-+  ad=1.6739e+12p pd=1.049e+07u as=6.697e+11p ps=6.25e+06u
-M1001 a_227_368# a_27_392# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.856e+11p pd=8.48e+06u as=3.36e+11p ps=2.84e+06u
-M1002 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_495_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.396e+11p pd=8.22e+06u as=6.72e+11p ps=5.68e+06u
-M1004 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_495_368# B a_227_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C_N a_27_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1008 a_227_368# B a_495_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C_N a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1012 Y a_27_392# a_227_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_495_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_495_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_495_368# B a_227_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_27_392# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y a_27_392# a_227_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y a_27_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_392# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_27_392# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VPWR A a_495_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_227_368# B a_495_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_227_368# a_27_392# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.cdl b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.cdl
index 09eff8f..652df32 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.cdl
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nor3b_4 A B C_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMIP2 C C_N VPB pfet_01v8_hvt m=2 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
+MMN0 Y A 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
-MMP1 sndPA B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMIP2 C C_N VPB phighvt m=2 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
-MMN0 Y A 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMIN2 C C_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N 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_ls__nor3b_4
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.netlist.tsv b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.netlist.tsv
index ee0db15..7cc87bb 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nor3b_4	A:I B:I C_N: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	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/nor3b/sky130_fd_sc_ls__nor3b_4.spice b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.spice
index d498ec7..ecab2f2 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.spice
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_ls__nor3b_4 A B C_N VGND VNB VPB VPWR Y
-M1000 VPWR A a_126_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.3762e+12p pd=1.105e+07u as=1.428e+12p ps=1.151e+07u
-M1001 Y a_468_264# VGND VNB nshort w=740000u l=150000u
-+  ad=1.3135e+12p pd=1.243e+07u as=2.0498e+12p ps=1.59e+07u
-M1002 Y a_468_264# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.7248e+12p ps=1.428e+07u
-M1003 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_368# a_468_264# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_468_264# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_468_264# C_N VGND VNB nshort w=740000u l=150000u
-+  ad=6.771e+11p pd=3.31e+06u as=0p ps=0u
-M1008 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_368# B a_126_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_468_264# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_468_264# C_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1014 a_27_368# B a_126_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_126_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_126_368# B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_468_264# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_126_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR C_N a_468_264# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_126_368# B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_368# a_468_264# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_126_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_468_264# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C_N a_468_264# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_27_368# B a_126_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_27_368# a_468_264# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR A a_126_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_126_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_27_368# B a_126_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_368# a_468_264# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_126_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_468_264# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND a_468_264# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_126_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 Y a_468_264# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Y a_468_264# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_126_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VPWR A a_126_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 Y a_468_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VPWR C_N a_468_264# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 VGND a_468_264# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 Y a_468_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_1.cdl b/cells/nor4/sky130_fd_sc_ls__nor4_1.cdl
index 05d011f..cf19b6c 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_1.cdl
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4_1 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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.028 perim=0.76
+MMP1 sndPA B VPB 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.028 perim=0.76
+MMP2 sndPB C VPB 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.028 perim=0.76
+MMP3 sndPC D VPB 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.028 perim=0.76
+MMN0 Y 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.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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.028 perim=0.76
-MMN0 Y 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.028 perim=0.76
-MMN1 Y B 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.028 perim=0.76
-MMN2 Y C 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.028 perim=0.76
-MMN3 Y D 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.028 perim=0.76
 .ENDS sky130_fd_sc_ls__nor4_1
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_1.netlist.tsv b/cells/nor4/sky130_fd_sc_ls__nor4_1.netlist.tsv
index 0f2ec0e..a0c5d70 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_1.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nor4_1	A:I B:I C:I D: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_1.spice b/cells/nor4/sky130_fd_sc_ls__nor4_1.spice
index 86cc226..2f0fd29 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_1.spice
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__nor4_1 A B C D VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=8.7975e+11p ps=6.9e+06u
-M1001 Y D a_342_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=4.704e+11p ps=3.08e+06u
-M1002 a_228_368# B a_144_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.704e+11p pd=3.08e+06u as=3.024e+11p ps=2.78e+06u
-M1003 a_342_368# C a_228_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND D Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_144_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
+X0 VPWR A a_144_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_144_368# B a_228_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_228_368# C a_342_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_342_368# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_2.cdl b/cells/nor4/sky130_fd_sc_ls__nor4_2.cdl
index 05f76df..13e0adc 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_2.cdl
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4_2 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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.028 perim=0.76
+MMP1 sndPA B VPB 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.028 perim=0.76
+MMP2 sndPB C VPB 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.028 perim=0.76
+MMP3 sndPC D VPB 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.028 perim=0.76
+MMN0 Y 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.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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.028 perim=0.76
-MMN0 Y 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.028 perim=0.76
-MMN1 Y B 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.028 perim=0.76
-MMN2 Y C 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.028 perim=0.76
-MMN3 Y D 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.028 perim=0.76
 .ENDS sky130_fd_sc_ls__nor4_2
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_2.netlist.tsv b/cells/nor4/sky130_fd_sc_ls__nor4_2.netlist.tsv
index d89b2f7..2f24ddd 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_2.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nor4_2	A:I B:I C:I D: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_2.spice b/cells/nor4/sky130_fd_sc_ls__nor4_2.spice
index 4ab29cf..640c037 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_2.spice
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__nor4_2 A B C D VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=9.064e+11p pd=7.51e+06u as=4.44e+11p ps=4.16e+06u
-M1001 a_27_368# C a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0304e+12p pd=8.56e+06u as=6.888e+11p ps=5.71e+06u
-M1002 VPWR A a_490_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=7.728e+11p ps=5.86e+06u
-M1003 Y D a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.64e+11p pd=2.89e+06u as=0p ps=0u
-M1004 VGND C Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_490_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_116_368# C a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y D VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# B a_490_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_490_368# B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_116_368# D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_490_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_116_368# C a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_368# B a_490_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_368# C a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A a_490_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_116_368# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y D a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_490_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_4.cdl b/cells/nor4/sky130_fd_sc_ls__nor4_4.cdl
index f7a94f5..b84d45c 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_4.cdl
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4_4 A B C D VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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.028 perim=0.76
+MMP1 sndPA B VPB 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.028 perim=0.76
+MMP2 sndPB C VPB 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.028 perim=0.76
+MMP3 sndPC D VPB 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.028 perim=0.76
+MMN0 Y 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.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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.028 perim=0.76
-MMN0 Y 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.028 perim=0.76
-MMN1 Y B 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.028 perim=0.76
-MMN2 Y C 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.028 perim=0.76
-MMN3 Y D 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.028 perim=0.76
 .ENDS sky130_fd_sc_ls__nor4_4
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_4.netlist.tsv b/cells/nor4/sky130_fd_sc_ls__nor4_4.netlist.tsv
index b75ada1..395cd6e 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_4.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__nor4_4	A:I B:I C:I D: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_4.spice b/cells/nor4/sky130_fd_sc_ls__nor4_4.spice
index d1caafd..1a536fa 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_4.spice
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__nor4_4 A B C D VGND VNB VPB VPWR Y
-M1000 a_27_368# D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.7248e+12p pd=1.428e+07u as=7.28e+11p ps=5.78e+06u
-M1001 a_879_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.6912e+12p pd=1.422e+07u as=8.96e+11p ps=6.08e+06u
-M1002 VGND D Y VNB nshort w=740000u l=150000u
-+  ad=2.6973e+12p pd=1.469e+07u as=2.4864e+12p ps=1.264e+07u
-M1003 a_496_368# B a_879_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.344e+12p pd=1.136e+07u as=0p ps=0u
-M1004 a_879_368# B a_496_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_496_368# C a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_879_368# B a_496_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_879_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_368# C a_496_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_368# D Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y D a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_879_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_496_368# C a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y D a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_879_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y D VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_368# C a_496_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_496_368# B a_879_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_368# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_496_368# C a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_879_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR A a_879_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_496_368# C a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_496_368# B a_879_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_27_368# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y D a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y D a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_27_368# C a_496_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_879_368# B a_496_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_879_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VPWR A a_879_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_368# C a_496_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_879_368# B a_496_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_496_368# B a_879_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.cdl b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.cdl
index 45ebe01..d0ee39a 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.cdl
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4b_1 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMP3 sndPC D VPB 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
+MMIP3 D D_N VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMP3 sndPC D VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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
-MMIP3 D D_N VPB 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
-MMN0 Y 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMN3 Y D 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
-MMIN3 D D_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nor4b_1
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.netlist.tsv b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.netlist.tsv
index 58b5e65..1393d0c 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__nor4b_1	A:I B:I C:I D_N: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.spice b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.spice
index adeb076..8b7a7ed 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.spice
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__nor4b_1 A B C D_N VGND VNB VPB VPWR Y
-M1000 Y C VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=8.594e+11p ps=6.85e+06u
-M1001 Y a_57_368# a_446_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.648e+11p pd=3.07e+06u as=4.704e+11p ps=3.08e+06u
-M1002 a_344_368# B a_260_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.032e+11p pd=2.96e+06u as=3.024e+11p ps=2.78e+06u
-M1003 a_446_368# C a_344_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_57_368# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_260_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.354e+11p ps=3.08e+06u
-M1007 VGND D_N a_57_368# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1008 VPWR D_N a_57_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1009 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_57_368# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_446_368# a_57_368# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y a_57_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_260_368# B a_344_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A a_260_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_57_368# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_344_368# C a_446_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.cdl b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.cdl
index 63b9681..198ea4c 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.cdl
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4b_2 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMP3 sndPC D VPB 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
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMP3 sndPC D VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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
-MMIP3 D D_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMN3 Y D 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
-MMIN3 D D_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nor4b_2
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.netlist.tsv b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.netlist.tsv
index 6835e46..e08c73a 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__nor4b_2	A:I B:I C:I D_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.spice b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.spice
index b870558..92ff9cc 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.spice
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__nor4b_2 A B C D_N VGND VNB VPB VPWR Y
-M1000 a_498_368# C a_229_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=9.968e+11p ps=8.5e+06u
-M1001 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=9.879e+11p pd=8.59e+06u as=1.7479e+12p ps=1.217e+07u
-M1002 a_229_368# C a_498_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_392# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_498_368# B a_701_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=9.968e+11p ps=8.5e+06u
-M1006 Y a_27_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_27_392# a_229_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1009 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_701_368# B a_498_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_701_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.422e+11p ps=5.45e+06u
-M1013 VPWR D_N a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1014 a_229_368# a_27_392# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_701_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND D_N a_27_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
+X0 a_701_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_27_392# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 Y a_27_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_701_368# B a_498_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_498_368# C a_229_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR A a_701_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND a_27_392# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y a_27_392# a_229_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_498_368# B a_701_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_27_392# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_229_368# C a_498_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_229_368# a_27_392# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.cdl b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.cdl
index 5644f83..6a1c4cb 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.cdl
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4b_4 A B C D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMP3 sndPC D VPB 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
+MMIP3 D D_N VPB pfet_01v8_hvt m=2 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
+MMN0 Y A 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
-MMP1 sndPA B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMP3 sndPC D VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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
-MMIP3 D D_N VPB phighvt m=2 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
-MMN0 Y A 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMN3 Y D 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
-MMIN3 D D_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N 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_ls__nor4b_4
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.netlist.tsv b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.netlist.tsv
index b27061d..a7c475d 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__nor4b_4	A:I B:I C:I D_N: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	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/nor4b/sky130_fd_sc_ls__nor4b_4.spice b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.spice
index 8130f02..a6d93fa 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.spice
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.spice
@@ -16,74 +16,39 @@
 
 
 .subckt sky130_fd_sc_ls__nor4b_4 A B C D_N VGND VNB VPB VPWR Y
-M1000 Y a_47_88# VGND VNB nshort w=740000u l=150000u
-+  ad=1.7686e+12p pd=1.662e+07u as=3.0229e+12p ps=2.149e+07u
-M1001 a_319_368# a_47_88# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.8088e+12p pd=1.443e+07u as=6.72e+11p ps=5.68e+06u
-M1002 VGND a_47_88# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_1191_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.1676e+12p pd=1.022e+07u as=1.7248e+12p ps=1.428e+07u
-M1004 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_319_368# C a_778_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.484e+12p ps=1.161e+07u
-M1007 VGND C Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_47_88# a_319_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_778_368# B a_1191_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1191_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND D_N a_47_88# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=3.1115e+11p ps=2.85e+06u
-M1015 VGND a_47_88# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_319_368# a_47_88# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1191_368# B a_778_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_778_368# C a_319_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR D_N a_47_88# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1022 VPWR A a_1191_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_47_88# D_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_778_368# B a_1191_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_778_368# C a_319_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y a_47_88# a_319_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1191_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y a_47_88# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_319_368# C a_778_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1191_368# B a_778_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND C Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_1191_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_319_368# a_47_88# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_47_88# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 Y a_47_88# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_778_368# B a_1191_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_778_368# C a_319_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_1191_368# B a_778_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_319_368# a_47_88# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_778_368# C a_319_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_778_368# B a_1191_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_1191_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y a_47_88# a_319_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_1191_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_1191_368# B a_778_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VGND a_47_88# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VPWR D_N a_47_88# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 Y a_47_88# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 Y a_47_88# a_319_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_47_88# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VPWR A a_1191_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_319_368# C a_778_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 a_319_368# C a_778_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 VGND a_47_88# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.cdl b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.cdl
index b70129f..2e825e4 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.cdl
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4bb_1 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMP3 sndPC D VPB 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
+MMIP2 C C_N VPB 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
+MMIP3 D D_N VPB 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
+MMN0 Y 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
-MMP1 sndPA B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMP3 sndPC D VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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
-MMIP2 C C_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB 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
-MMN0 Y 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMN3 Y D 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
-MMIN2 C C_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nor4bb_1
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.netlist.tsv b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.netlist.tsv
index bd4e46c..91bd1fe 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__nor4bb_1	A:I B:I C_N:I D_N: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.spice b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.spice
index 57786e7..629bf68 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.spice
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__nor4bb_1 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 a_313_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.25235e+12p ps=6.48e+06u
-M1001 a_530_368# a_27_112# a_397_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.704e+11p pd=3.08e+06u as=5.768e+11p ps=3.27e+06u
-M1002 a_611_244# D_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=1.51135e+12p ps=8.63e+06u
-M1003 VGND C_N a_27_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=3.025e+11p ps=2.2e+06u
-M1004 a_611_244# D_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1005 VGND a_611_244# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=5.18e+11p ps=4.36e+06u
-M1006 Y a_27_112# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR C_N a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1008 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_397_368# B a_313_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_611_244# a_530_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
+X0 a_397_368# a_27_112# a_530_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_530_368# a_611_244# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR D_N a_611_244# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_27_112# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 Y a_611_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_112# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_313_368# B a_397_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND D_N a_611_244# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 VPWR A a_313_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND a_27_112# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.cdl b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.cdl
index 4058bf4..60c7cb9 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.cdl
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4bb_2 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMP3 sndPC D VPB 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
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMP3 sndPC D VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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
-MMIP2 C C_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMN3 Y D 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
-MMIN2 C C_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__nor4bb_2
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.netlist.tsv b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.netlist.tsv
index f86e8d6..47d4b28 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__nor4bb_2	A:I B:I C_N:I D_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.spice b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.spice
index 2372de7..58ed915 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.spice
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__nor4bb_2 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 Y a_311_124# VGND VNB nshort w=740000u l=150000u
-+  ad=8.621e+11p pd=8.25e+06u as=2.32715e+12p ps=1.585e+07u
-M1001 a_493_368# a_311_124# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0528e+12p pd=8.6e+06u as=3.36e+11p ps=2.84e+06u
-M1002 VGND a_27_392# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_985_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0528e+12p pd=8.6e+06u as=1.506e+12p ps=7.18e+06u
-M1004 a_311_124# D_N VGND VNB nshort w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1005 a_772_368# a_27_392# a_493_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.28e+11p pd=5.78e+06u as=0p ps=0u
-M1006 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_493_368# a_27_392# a_772_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_772_368# B a_985_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_311_124# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_27_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_311_124# D_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1013 a_985_368# B a_772_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C_N a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1015 Y a_311_124# a_493_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND C_N a_27_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1017 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_985_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_985_368# B a_772_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_392# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A a_985_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND a_311_124# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y a_311_124# a_493_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR D_N a_311_124# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_772_368# B a_985_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_27_392# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 Y a_311_124# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VGND a_27_392# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_493_368# a_27_392# a_772_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VGND D_N a_311_124# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 Y a_27_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_985_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_772_368# a_27_392# a_493_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_493_368# a_311_124# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.cdl b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.cdl
index f8d3122..c773438 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.cdl
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__nor4bb_4 A B C_N D_N VGND VNB VPB VPWR Y
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMP0 VPWR A VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMP2 sndPB C VPB 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
+MMP3 sndPC D VPB 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
+MMIP2 C C_N VPB pfet_01v8_hvt m=2 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
+MMIP3 D D_N VPB pfet_01v8_hvt m=2 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
+MMN0 Y A 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
-MMP1 sndPA B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B 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
-MMP2 sndPB C VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C 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
-MMP3 sndPC D VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D 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
-MMIP2 C C_N VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N 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
-MMIP3 D D_N VPB phighvt m=2 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
-MMN0 Y A 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
-MMN1 Y B 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
-MMN2 Y C 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
-MMN3 Y D 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
-MMIN2 C C_N 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
-MMIN3 D D_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N 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_ls__nor4bb_4
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.netlist.tsv b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.netlist.tsv
index def04b9..badc1a6 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__nor4bb_4	A:I B:I C_N:I D_N: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	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/nor4bb/sky130_fd_sc_ls__nor4bb_4.spice b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.spice
index 293dcd1..d8d27f6 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.spice
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ls__nor4bb_4 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 VPWR A a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.6184e+12p pd=1.288e+07u as=1.53423e+12p ps=1.186e+07u
-M1001 VGND a_1162_48# Y VNB nshort w=740000u l=150000u
-+  ad=3.2708e+12p pd=2.364e+07u as=1.8722e+12p ps=1.69e+07u
-M1002 Y a_1162_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_1162_48# D_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 a_897_349# a_1162_48# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.7528e+12p pd=1.209e+07u as=6.72e+11p ps=5.68e+06u
-M1005 VGND a_864_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_368# B a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.9823e+12p pd=1.514e+07u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_864_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR D_N a_1162_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1010 VGND a_1162_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_116_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_116_368# B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_897_349# a_864_48# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_864_48# C_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1017 a_1162_48# D_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_864_48# C_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1020 a_27_368# a_864_48# a_897_349# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_116_368# B a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_368# B a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_1162_48# a_897_349# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR C_N a_864_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_897_349# a_864_48# a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_1162_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_116_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y a_864_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_864_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_368# a_864_48# a_897_349# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_897_349# a_1162_48# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND B Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y a_1162_48# a_897_349# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_897_349# a_1162_48# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_897_349# a_1162_48# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_864_48# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y a_1162_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y a_864_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_368# a_864_48# a_897_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR A a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND a_1162_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 Y a_1162_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_116_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_1162_48# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_27_368# B a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VPWR D_N a_1162_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VGND C_N a_864_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_27_368# B a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 Y a_1162_48# a_897_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 Y a_1162_48# a_897_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VGND D_N a_1162_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VGND a_1162_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_116_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_27_368# a_864_48# a_897_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 Y a_864_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 a_116_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_897_349# a_864_48# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 VPWR C_N a_864_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X31 VPWR A a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 VGND a_864_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 a_897_349# a_864_48# a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 a_116_368# B a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 VGND a_864_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.cdl b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.cdl
index 1881dce..830d613 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.cdl
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o2111a_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPD0 VPWR D1 VPB 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
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPC0 VPWR C1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPD0 VPWR D1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 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
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 pndC C1 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
-MMND0 y D1 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
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o2111a_1
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.netlist.tsv b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.netlist.tsv
index cd1f3e0..35343d6 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o2111a_1	A1:I A2:I B1:I C1:I D1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	y	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o2111a/sky130_fd_sc_ls__o2111a_1.spice b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.spice
index 7211123..65aa043 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.spice
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o2111a_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_600_381# VPB phighvt w=1e+06u l=150000u
-+  ad=1.27638e+12p pd=8.66e+06u as=2.7e+11p ps=2.54e+06u
-M1001 a_600_381# A2 a_82_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6.646e+11p ps=5.15e+06u
-M1002 VGND A2 a_471_74# VNB nshort w=740000u l=150000u
-+  ad=4.921e+11p pd=4.29e+06u as=4.773e+11p ps=4.25e+06u
-M1003 a_82_48# D1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_82_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.035e+11p ps=2.03e+06u
-M1005 a_471_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_82_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1007 VPWR C1 a_82_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_82_48# B1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_321_74# D1 a_82_48# VNB nshort w=740000u l=150000u
-+  ad=1.554e+11p pd=1.9e+06u as=2.59e+11p ps=2.18e+06u
-M1010 a_393_74# C1 a_321_74# VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1011 a_471_74# B1 a_393_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR D1 a_82_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_82_48# A2 a_600_381# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_82_48# D1 a_321_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_82_48# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR B1 a_82_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 X a_82_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_82_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_393_74# B1 a_471_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_471_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND A1 a_471_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_321_74# C1 a_393_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_600_381# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.cdl b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.cdl
index 638a882..7cc848d 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.cdl
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o2111a_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPD0 VPWR D1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPD0 VPWR D1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 pndC C1 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
-MMND0 y D1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o2111a_2
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.netlist.tsv b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.netlist.tsv
index f49d8d1..db75eeb 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o2111a_2	A1:I A2:I B1:I C1:I D1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.spice b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.spice
index 9eb50a9..4b607b5 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.spice
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__o2111a_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_54_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=5.217e+11p pd=4.37e+06u as=7.955e+11p ps=6.59e+06u
-M1001 VGND a_236_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1002 a_152_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.0332e+12p ps=1.24e+07u
-M1003 X a_236_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1004 a_236_368# C1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=7.7e+11p pd=5.54e+06u as=0p ps=0u
-M1005 a_461_74# C1 a_369_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=2.294e+11p ps=2.1e+06u
-M1006 VPWR a_236_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR D1 a_236_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A1 a_54_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B1 a_236_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_236_368# D1 a_461_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1011 X a_236_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_369_74# B1 a_54_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_236_368# A2 a_152_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_236_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 X a_236_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR C1 a_236_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_236_368# D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND a_236_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 X a_236_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_152_368# A2 a_236_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_54_74# B1 a_369_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_54_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_369_74# C1 a_461_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR A1 a_152_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VPWR a_236_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND A2 a_54_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_461_74# D1 a_236_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.cdl b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.cdl
index e1faf3b..0dfdd26 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.cdl
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o2111a_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPD0 VPWR D1 VPB pfet_01v8_hvt m=2 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
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPC0 VPWR C1 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPD0 VPWR D1 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 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
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 pndC C1 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
-MMND0 y D1 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
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o2111a_4
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.netlist.tsv b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.netlist.tsv
index 9f2dd82..72067d8 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o2111a_4	A1:I A2:I B1:I C1:I D1: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	y	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.spice b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.spice
index 4728ec2..ff672a5 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.spice
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__o2111a_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VPWR a_27_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.3662e+12p pd=1.861e+07u as=7.28e+11p ps=5.78e+06u
-M1001 a_747_392# A2 a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.5e+11p pd=5.3e+06u as=1.6102e+12p ps=1.263e+07u
-M1002 a_287_74# C1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=6.6465e+11p ps=6.59e+06u
-M1003 a_27_392# C1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_287_74# B1 a_477_198# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=8.5105e+11p ps=8.36e+06u
-M1005 a_27_392# A2 a_747_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_477_198# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.295e+12p ps=1.09e+07u
-M1007 VPWR B1 a_27_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_747_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_27_392# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1011 a_477_198# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# C1 a_287_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_392# B1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_27_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_27_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_747_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# D1 a_27_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1018 a_27_392# D1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A1 a_477_198# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_27_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_392# D1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_27_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR D1 a_27_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_27_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_477_198# B1 a_287_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A2 a_477_198# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR C1 a_27_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_747_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_477_198# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND a_27_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_27_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_74# C1 a_287_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR C1 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_287_74# C1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 X a_27_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 X a_27_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR B1 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 X a_27_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_747_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VPWR D1 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_27_74# D1 a_27_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND A2 a_477_198# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_27_392# D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_287_74# B1 a_477_198# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND a_27_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_27_392# A2 a_747_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 X a_27_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VPWR a_27_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_27_392# D1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_477_198# B1 a_287_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_27_392# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 a_27_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_477_198# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_747_392# A2 a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 VGND A1 a_477_198# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.cdl b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.cdl
index 258a2d9..ebf86c3 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.cdl
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o2111ai_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMPD0 VPWR D1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 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
-MMPD0 VPWR D1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 pndC C1 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
-MMND0 Y D1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 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_ls__o2111ai_1
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.netlist.tsv b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.netlist.tsv
index 252a0e6..f42e5a4 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o2111ai_1	A1:I A2:I B1:I C1:I D1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.spice b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.spice
index 3fb3c8c..4a253a8 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.spice
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o2111ai_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7e+11p pd=5.73e+06u as=1.2544e+12p ps=8.96e+06u
-M1001 a_368_74# B1 a_260_74# VNB nshort w=740000u l=150000u
-+  ad=4.773e+11p pd=4.25e+06u as=2.886e+11p ps=2.26e+06u
-M1002 VGND A2 a_368_74# VNB nshort w=740000u l=150000u
-+  ad=3.256e+11p pd=2.36e+06u as=0p ps=0u
-M1003 Y D1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_368_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_182_74# D1 Y VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=4.625e+11p ps=2.73e+06u
-M1007 a_260_74# C1 a_182_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_490_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.416e+11p pd=2.85e+06u as=0p ps=0u
-M1009 VPWR A1 a_490_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y A2 a_490_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_182_74# C1 a_260_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_368_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND A1 a_368_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_260_74# B1 a_368_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_490_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y D1 a_182_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.cdl b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.cdl
index 316f068..4397902 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.cdl
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o2111ai_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMPD0 VPWR D1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 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
-MMPD0 VPWR D1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 pndC C1 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
-MMND0 Y D1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 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
 .ENDS sky130_fd_sc_ls__o2111ai_2
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.netlist.tsv b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.netlist.tsv
index 5d0751b..1d12515 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o2111ai_2	A1:I A2:I B1:I C1:I D1: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.spice b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.spice
index 1e31f1b..240df89 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.spice
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__o2111ai_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_510_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=8.362e+11p pd=8.18e+06u as=4.81e+11p ps=4.26e+06u
-M1001 a_697_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.968e+11p pd=8.5e+06u as=1.344e+12p ps=1.136e+07u
-M1002 a_40_74# C1 a_299_74# VNB nshort w=740000u l=150000u
-+  ad=6.29e+11p pd=6.14e+06u as=5.18e+11p ps=4.36e+06u
-M1003 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.7808e+12p pd=1.438e+07u as=0p ps=0u
-M1004 a_299_74# C1 a_40_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_697_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_510_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_697_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_510_74# B1 a_299_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_299_74# B1 a_510_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A1 a_510_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_40_74# D1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1014 Y D1 a_40_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y D1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR D1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_510_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A2 a_697_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_510_74# B1 a_299_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y A2 a_697_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_299_74# C1 a_40_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y D1 a_40_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A1 a_510_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_40_74# C1 a_299_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VPWR A1 a_697_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_697_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND A2 a_510_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_697_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_299_74# B1 a_510_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_510_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_40_74# D1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_510_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.cdl b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.cdl
index 9e5af03..ddbacea 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.cdl
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o2111ai_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I D1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMPD0 VPWR D1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 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
-MMPD0 VPWR D1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 pndC C1 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
-MMND0 Y D1 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 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
 .ENDS sky130_fd_sc_ls__o2111ai_4
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.netlist.tsv b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.netlist.tsv
index c738f73..c6c1d95 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o2111ai_4	A1:I A2:I B1:I C1:I D1: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.spice b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.spice
index 05d8115..115466b 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.spice
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__o2111ai_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_954_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.996e+12p pd=1.655e+07u as=2.3912e+12p ps=1.547e+07u
-M1001 a_841_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.5688e+12p pd=1.46e+07u as=9.324e+11p ps=8.44e+06u
-M1002 a_841_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=2.9456e+12p ps=1.87e+07u
-M1004 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_841_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_74# C1 a_472_74# VNB nshort w=740000u l=150000u
-+  ad=1.0434e+12p pd=1.022e+07u as=8.288e+11p ps=8.16e+06u
-M1007 a_472_74# B1 a_841_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# D1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1009 VGND A1 a_841_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# D1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_954_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_841_74# B1 a_472_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_841_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_841_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_954_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A1 a_841_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_472_74# C1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A2 a_954_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_841_74# B1 a_472_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_472_74# C1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1 a_954_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y D1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2 a_841_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_954_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_472_74# B1 a_841_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR D1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_954_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y D1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A2 a_954_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y D1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_74# C1 a_472_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_472_74# B1 a_841_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 Y D1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_74# C1 a_472_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_841_74# B1 a_472_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_472_74# B1 a_841_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_954_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_954_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y A2 a_954_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_472_74# C1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND A1 a_841_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_841_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND A2 a_841_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_27_74# C1 a_472_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_472_74# C1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_841_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VGND A2 a_841_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_954_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 VPWR A1 a_954_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_841_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VGND A1 a_841_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_841_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_27_74# D1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 Y D1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 a_841_74# B1 a_472_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 VPWR A1 a_954_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_27_74# D1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 Y A2 a_954_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 a_954_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_1.cdl b/cells/o211a/sky130_fd_sc_ls__o211a_1.cdl
index 789aa5e..cbd1954 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_1.cdl
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o211a_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o211a_1
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_1.netlist.tsv b/cells/o211a/sky130_fd_sc_ls__o211a_1.netlist.tsv
index efcdb31..d1327de 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_1.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o211a_1	A1:I A2:I B1:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o211a/sky130_fd_sc_ls__o211a_1.spice b/cells/o211a/sky130_fd_sc_ls__o211a_1.spice
index a24578e..a49fc42 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_1.spice
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o211a_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_398_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.1718e+12p ps=8.52e+06u
-M1001 VPWR B1 a_83_264# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.95e+11p ps=5.19e+06u
-M1002 a_83_264# C1 a_662_136# VNB nshort w=640000u l=150000u
-+  ad=2.112e+11p pd=1.94e+06u as=2.08e+11p ps=1.93e+06u
-M1003 VGND A1 a_257_136# VNB nshort w=640000u l=150000u
-+  ad=5.891e+11p pd=4.49e+06u as=6.816e+11p ps=4.69e+06u
-M1004 a_662_136# B1 a_257_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_83_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1006 a_257_136# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_83_264# A2 a_398_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_83_264# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_83_264# C1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_257_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR C1 a_83_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_257_136# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_662_136# C1 a_83_264# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_83_264# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_257_136# B1 a_662_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR A1 a_398_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_398_392# A2 a_83_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_2.cdl b/cells/o211a/sky130_fd_sc_ls__o211a_2.cdl
index 00f0cd1..8eca3e6 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_2.cdl
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o211a_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 y C1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o211a_2
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_2.netlist.tsv b/cells/o211a/sky130_fd_sc_ls__o211a_2.netlist.tsv
index bf21814..874fc6d 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_2.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o211a_2	A1:I A2:I B1:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_2.spice b/cells/o211a/sky130_fd_sc_ls__o211a_2.spice
index b8915ff..d917ce5 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_2.spice
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o211a_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_27_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.5282e+12p pd=9.39e+06u as=3.36e+11p ps=2.84e+06u
-M1001 X a_27_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=7.498e+11p ps=6.7e+06u
-M1002 a_195_74# B1 a_117_74# VNB nshort w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=1.776e+11p ps=1.96e+06u
-M1003 VGND a_27_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C1 a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.95e+11p ps=5.19e+06u
-M1005 VPWR A1 a_314_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1006 X a_27_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_195_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_117_74# C1 a_27_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1010 a_195_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_314_368# A2 a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_314_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_27_368# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_27_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_368# A2 a_314_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 X a_27_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_117_74# B1 a_195_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND A1 a_195_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_27_368# C1 a_117_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR a_27_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_195_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_4.cdl b/cells/o211a/sky130_fd_sc_ls__o211a_4.cdl
index f1f5a3d..62d37fc 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_4.cdl
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o211a_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o211a_4
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_4.netlist.tsv b/cells/o211a/sky130_fd_sc_ls__o211a_4.netlist.tsv
index f89f743..952d65b 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_4.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o211a_4	A1:I A2:I B1:I C1: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_4.spice b/cells/o211a/sky130_fd_sc_ls__o211a_4.spice
index 3106e2b..6d20beb 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_4.spice
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__o211a_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_968_391# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6e+11p pd=5.2e+06u as=2.5064e+12p ps=1.74e+07u
-M1001 a_91_48# A2 a_968_391# VPB phighvt w=1e+06u l=150000u
-+  ad=8.54e+11p pd=7.26e+06u as=0p ps=0u
-M1002 a_510_125# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=8.089e+11p pd=7.65e+06u as=1.1032e+12p ps=1.016e+07u
-M1003 a_91_48# B1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_91_48# C1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_968_391# A2 a_91_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_510_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_91_48# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1008 VPWR a_91_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1009 VPWR C1 a_91_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_91_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_510_125# B1 a_597_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.032e+11p ps=3.82e+06u
-M1012 X a_91_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_597_125# C1 a_91_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1014 VPWR A1 a_968_391# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_91_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_91_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_91_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_597_125# B1 a_510_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A2 a_510_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_510_125# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_91_48# C1 a_597_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_91_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_91_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_91_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_968_391# A2 a_91_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 X a_91_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR C1 a_91_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR a_91_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR B1 a_91_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_510_125# B1 a_597_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_91_48# A2 a_968_391# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_91_48# C1 a_597_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_510_125# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VGND a_91_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_597_125# B1 a_510_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 X a_91_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR a_91_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_597_125# C1 a_91_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_91_48# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VGND A1 a_510_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VGND A2 a_510_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_91_48# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X19 VGND a_91_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_968_391# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 X a_91_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_510_125# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 VPWR A1 a_968_391# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.cdl b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.cdl
index 5908237..cbfe6af 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.cdl
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o211ai_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 Y C1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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_ls__o211ai_1
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.netlist.tsv b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.netlist.tsv
index e5bf32b..ffc2726 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o211ai_1	A1:I A2:I B1:I C1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.spice b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.spice
index eab29e9..7f911cd 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.spice
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__o211ai_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y A2 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.688e+11p pd=6.21e+06u as=3.024e+11p ps=2.78e+06u
-M1001 a_31_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=4.44e+11p pd=4.16e+06u as=2.59e+11p ps=2.18e+06u
-M1002 a_311_74# B1 a_31_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1003 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.224e+11p pd=5.77e+06u as=0p ps=0u
-M1004 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_116_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_31_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C1 a_311_74# VNB nshort w=740000u l=150000u
-+  ad=4.588e+11p pd=2.72e+06u as=0p ps=0u
+X0 a_31_74# B1 a_311_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR A1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_116_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A2 a_31_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_31_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_311_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.cdl b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.cdl
index 2088f01..e34a408 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.cdl
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o211ai_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 Y C1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__o211ai_2
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.netlist.tsv b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.netlist.tsv
index 2ec7e90..fae07e5 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o211ai_2	A1:I A2:I B1:I C1: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.spice b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.spice
index 5a3ad75..69216a8 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.spice
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__o211ai_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_303_84# B1 a_30_84# VNB nshort w=740000u l=150000u
-+  ad=7.067e+11p pd=6.35e+06u as=6.882e+11p ps=6.3e+06u
-M1001 VPWR A1 a_505_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.3888e+12p pd=1.144e+07u as=9.968e+11p ps=8.5e+06u
-M1002 Y C1 a_30_84# VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 a_30_84# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A2 a_303_84# VNB nshort w=740000u l=150000u
-+  ad=6.512e+11p pd=6.2e+06u as=0p ps=0u
-M1005 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.008e+12p pd=8.52e+06u as=0p ps=0u
-M1006 a_303_84# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_505_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_303_84# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_303_84# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A2 a_505_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_505_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_30_84# B1 a_303_84# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_303_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND A1 a_303_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 Y C1 a_30_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_303_84# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_303_84# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A2 a_505_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_303_84# B1 a_30_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_30_84# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_30_84# B1 a_303_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_505_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_505_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VPWR A1 a_505_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.cdl b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.cdl
index 369d33d..ef40143 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.cdl
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o211ai_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNC0 Y C1 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__o211ai_4
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.netlist.tsv b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.netlist.tsv
index 7ac33e2..61a6292 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o211ai_4	A1:I A2:I B1:I C1: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.spice b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.spice
index 5edf932..c749bb8 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.spice
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__o211ai_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 a_834_74# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.0434e+12p ps=1.022e+07u
-M1001 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.3744e+12p pd=1.544e+07u as=1.5008e+12p ps=1.164e+07u
-M1002 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=9.472e+11p pd=8.48e+06u as=1.4578e+12p ps=1.43e+07u
-M1003 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_30_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.7808e+12p pd=1.438e+07u as=0p ps=0u
-M1005 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_834_74# B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_30_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_30_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A2 a_30_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# B1 a_834_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_30_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_834_74# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_30_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_834_74# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_834_74# B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_74# B1 a_834_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_30_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A2 a_30_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y C1 a_834_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_30_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_27_74# B1 a_834_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_30_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_834_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y A2 a_30_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y C1 a_834_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_30_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_834_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_834_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_834_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 Y A2 a_30_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_30_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y C1 a_834_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_27_74# B1 a_834_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VPWR A1 a_30_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VPWR A1 a_30_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_1.cdl b/cells/o21a/sky130_fd_sc_ls__o21a_1.cdl
index 7e3e497..6037ebb 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_1.cdl
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_1.netlist.tsv b/cells/o21a/sky130_fd_sc_ls__o21a_1.netlist.tsv
index 8fdc477..72254c3 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_1.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o21a/sky130_fd_sc_ls__o21a_1.spice b/cells/o21a/sky130_fd_sc_ls__o21a_1.spice
index 303b930..4befca4 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_1.spice
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__o21a_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_376_387# VPB phighvt w=1e+06u l=150000u
-+  ad=9.6465e+11p pd=6.12e+06u as=4.2e+11p ps=2.84e+06u
-M1001 a_320_74# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=3.901e+11p ps=3.89e+06u
-M1002 a_320_74# B1 a_83_244# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1003 a_83_244# B1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.406e+11p pd=2.71e+06u as=0p ps=0u
-M1004 a_376_387# A2 a_83_244# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_83_244# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1006 VGND a_83_244# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1007 VGND A2 a_320_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_83_244# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 X a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_83_244# A2 a_376_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_83_244# B1 a_320_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_320_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VGND A1 a_320_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 X a_83_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_376_387# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_2.cdl b/cells/o21a/sky130_fd_sc_ls__o21a_2.cdl
index 3af6bf2..3ee6b3f 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_2.cdl
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o21a_2 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 y B1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o21a_2
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_2.netlist.tsv b/cells/o21a/sky130_fd_sc_ls__o21a_2.netlist.tsv
index e43d591..0f67069 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_2.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o21a_2	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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_2.spice b/cells/o21a/sky130_fd_sc_ls__o21a_2.spice
index af65b7b..86b57ea 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_2.spice
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o21a_2 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_244_368# A2 a_160_368# VPB phighvt w=1e+06u l=150000u
-+  ad=4.2e+11p pd=2.84e+06u as=2.7e+11p ps=2.54e+06u
-M1001 a_160_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=1.2676e+12p ps=8.84e+06u
-M1002 X a_244_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1003 X a_244_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=8.14e+11p ps=6.64e+06u
-M1004 a_54_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=5.032e+11p pd=4.32e+06u as=0p ps=0u
-M1005 VPWR a_244_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_54_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_244_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_244_368# B1 a_54_74# VNB nshort w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1009 VPWR B1 a_244_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_244_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_160_368# A2 a_244_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND A2 a_54_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR A1 a_160_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_244_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_54_74# B1 a_244_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_54_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND a_244_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_244_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 X a_244_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_4.cdl b/cells/o21a/sky130_fd_sc_ls__o21a_4.cdl
index 62907ed..4d3f76e 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_4.cdl
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o21a_4 A1 A2 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o21a_4
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_4.netlist.tsv b/cells/o21a/sky130_fd_sc_ls__o21a_4.netlist.tsv
index 5569f5b..865d8fa 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_4.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o21a_4	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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_4.spice b/cells/o21a/sky130_fd_sc_ls__o21a_4.spice
index a82a264..e9a940c 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_4.spice
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__o21a_4 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_116_387# A2 a_216_387# VPB phighvt w=1e+06u l=150000u
-+  ad=7e+11p pd=5.4e+06u as=6.192e+11p ps=5.04e+06u
-M1001 VPWR a_216_387# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.0608e+12p pd=1.474e+07u as=6.72e+11p ps=5.68e+06u
-M1002 VPWR B1 a_216_387# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_125# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=7.744e+11p pd=7.54e+06u as=1.1573e+12p ps=1.034e+07u
-M1004 VGND A2 a_27_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_116_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_216_387# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_216_387# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1008 VGND a_216_387# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_216_387# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_125# B1 a_216_387# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1011 VGND A1 a_27_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_216_387# B1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_125# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_216_387# B1 a_27_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_216_387# A2 a_116_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_116_387# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_216_387# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_216_387# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_216_387# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_116_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR a_216_387# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_125# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_116_387# A2 a_216_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND A2 a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 X a_216_387# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND A1 a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_216_387# B1 a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND a_216_387# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_216_387# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_27_125# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_216_387# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 X a_216_387# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR a_216_387# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_27_125# B1 a_216_387# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_216_387# A2 a_116_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 X a_216_387# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VPWR B1 a_216_387# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 X a_216_387# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_116_387# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.cdl b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.cdl
index ce5d2a5..1864c06 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.cdl
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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_ls__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.netlist.tsv b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.netlist.tsv
index 1b9b3c2..fb932ba 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.spice b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.spice
index a06f0ea..d80be3c 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.spice
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__o21ai_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_162_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.024e+11p pd=2.78e+06u as=7.952e+11p ps=5.9e+06u
-M1001 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=6.722e+11p ps=3.36e+06u
-M1002 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1003 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A2 a_162_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=5.656e+11p pd=3.25e+06u as=0p ps=0u
-M1005 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_162_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR A1 a_162_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.cdl b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.cdl
index c019767..ebcfb4a 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.cdl
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__o21ai_2 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__o21ai_2
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.netlist.tsv b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.netlist.tsv
index 08ed484..7b7d661 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__o21ai_2	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.spice b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.spice
index 3f01b3f..a033eb3 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.spice
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o21ai_2 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.968e+11p pd=8.5e+06u as=7.28e+11p ps=5.78e+06u
-M1001 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.28e+11p pd=5.78e+06u as=0p ps=0u
-M1002 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.331e+11p pd=2.11e+06u as=8.806e+11p ps=8.3e+06u
-M1003 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=5.069e+11p ps=4.33e+06u
-M1004 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_116_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A2 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_116_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A2 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_116_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR A1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_116_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.cdl b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.cdl
index 1d440e7..127001e 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.cdl
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__o21ai_4 A1 A2 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__o21ai_4
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.netlist.tsv b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.netlist.tsv
index e27b088..d325a91 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__o21ai_4	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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.spice b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.spice
index 170e268..3d32bfd 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.spice
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__o21ai_4 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=8.399e+11p pd=8.19e+06u as=1.4763e+12p ps=1.435e+07u
-M1001 VPWR A1 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.428e+12p pd=1.151e+07u as=1.6688e+12p ps=1.418e+07u
-M1002 a_116_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.064e+12p ps=8.62e+06u
-M1003 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1004 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A2 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_116_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_116_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_116_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A2 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_116_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y A2 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_116_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_116_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_116_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 Y A2 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.cdl b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.cdl
index 86996e7..7af5761 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.cdl
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o21ba_1 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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_ls__o21ba_1
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.netlist.tsv b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.netlist.tsv
index 44bd310..d02958e 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o21ba_1	A1:I A2:I B1_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o21ba/sky130_fd_sc_ls__o21ba_1.spice b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.spice
index 05960f3..eeec07f 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.spice
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o21ba_1 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 X a_200_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=1.052e+12p ps=8.29e+06u
-M1001 VPWR a_281_244# a_200_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=4.2e+11p ps=2.84e+06u
-M1002 a_200_392# A2 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 a_200_392# a_281_244# a_27_74# VNB nshort w=640000u l=150000u
-+  ad=2.176e+11p pd=1.96e+06u as=3.712e+11p ps=3.72e+06u
-M1004 VGND B1_N a_281_244# VNB nshort w=550000u l=150000u
-+  ad=5.587e+11p pd=4.44e+06u as=2.75e+11p ps=2.1e+06u
-M1005 VPWR B1_N a_281_244# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.108e+11p ps=2.42e+06u
-M1006 a_116_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_200_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 VGND a_200_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR a_200_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_281_244# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 a_27_74# a_281_244# a_200_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR A1 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_116_392# A2 a_200_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_281_244# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_200_392# a_281_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.cdl b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.cdl
index 1d9a879..0649d48 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.cdl
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o21ba_2 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 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
-MMIPX X y VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 y B1 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
-MMINB1N B1 B1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o21ba_2
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.netlist.tsv b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.netlist.tsv
index 9872b7f..cce3363 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o21ba_2	A1:I A2:I B1_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.spice b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.spice
index 83589c9..aa424e3 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.spice
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o21ba_2 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VGND a_177_48# X VNB nshort w=740000u l=150000u
-+  ad=7.8915e+11p pd=6.84e+06u as=2.072e+11p ps=2.04e+06u
-M1001 VGND A2 a_487_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.07e+11p ps=4.06e+06u
-M1002 VGND B1_N a_27_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5125e+11p ps=1.65e+06u
-M1003 VPWR B1_N a_27_74# VPB phighvt w=840000u l=150000u
-+  ad=1.511e+12p pd=9.31e+06u as=2.478e+11p ps=2.27e+06u
-M1004 a_177_48# a_27_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1005 X a_177_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1006 X a_177_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_487_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_582_368# A2 a_177_48# VPB phighvt w=1e+06u l=150000u
-+  ad=3.6e+11p pd=2.72e+06u as=0p ps=0u
-M1009 VPWR A1 a_582_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_177_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_487_74# a_27_74# a_177_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.035e+11p ps=2.03e+06u
+X0 VGND a_177_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_177_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_177_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_582_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_27_74# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 a_27_74# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_177_48# a_27_74# a_487_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_27_74# a_177_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_487_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 X a_177_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND A1 a_487_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_177_48# A2 a_582_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.cdl b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.cdl
index e182e8c..171b699 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.cdl
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o21ba_4 A1 A2 B1_N VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt 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
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N B1 B1_N 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
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N 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
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o21ba_4
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.netlist.tsv b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.netlist.tsv
index aca0830..7ed511e 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o21ba_4	A1:I A2:I B1_N: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.spice b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.spice
index 555160f..7df115b 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.spice
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__o21ba_4 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 X a_193_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=2.2288e+12p ps=1.517e+07u
-M1001 VPWR a_27_368# a_193_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=5.52e+11p ps=4.88e+06u
-M1002 VPWR A1 a_892_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6e+11p ps=5.2e+06u
-M1003 VGND a_193_48# X VNB nshort w=740000u l=150000u
-+  ad=1.0914e+12p pd=1.012e+07u as=4.218e+11p ps=4.1e+06u
-M1004 VGND A2 a_618_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=7.9445e+11p ps=7.84e+06u
-M1005 VGND a_193_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_618_94# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_193_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_193_48# a_27_368# a_618_94# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1009 a_618_94# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_618_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_193_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_193_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_892_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_618_94# a_27_368# a_193_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B1_N a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1016 a_193_48# a_27_368# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_193_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B1_N a_27_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1019 X a_193_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_193_48# A2 a_892_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_892_392# A2 a_193_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_892_392# A2 a_193_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_193_48# a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_618_94# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_193_48# A2 a_892_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR a_193_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND A2 a_618_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR a_193_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 X a_193_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_368# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A1 a_892_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_618_94# a_27_368# a_193_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_618_94# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_193_48# a_27_368# a_618_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_27_368# a_193_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_892_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VGND a_193_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 X a_193_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 X a_193_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 X a_193_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_27_368# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND A1 a_618_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VGND a_193_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.cdl b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.cdl
index 7b76b23..2eadaef 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.cdl
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o21bai_1 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMIPB1N B1 B1_N VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMIPB1N B1 B1_N VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 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
-MMINB1N B1 B1_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__o21bai_1
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.netlist.tsv b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.netlist.tsv
index a816235..5279270 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o21bai_1	A1:I A2:I B1_N: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.spice b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.spice
index 78f6ae1..6710905 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.spice
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__o21bai_1 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR B1_N a_27_74# VPB phighvt w=840000u l=150000u
-+  ad=1.05e+12p pd=6.61e+06u as=2.478e+11p ps=2.27e+06u
-M1001 a_395_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.696e+11p pd=2.9e+06u as=3.36e+11p ps=2.84e+06u
-M1002 VGND B1_N a_27_74# VNB nshort w=550000u l=150000u
-+  ad=3.6585e+11p pd=3.71e+06u as=1.54e+11p ps=1.66e+06u
-M1003 a_308_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=4.551e+11p pd=4.19e+06u as=0p ps=0u
-M1004 a_308_74# a_27_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1005 VGND A2 a_308_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_395_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 a_27_74# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_308_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y A2 a_395_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_395_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y a_27_74# a_308_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND A1 a_308_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR a_27_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.cdl b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.cdl
index db5cead..c113545 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.cdl
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o21bai_2 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMIPB1N B1 B1_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 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
-MMINB1N B1 B1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__o21bai_2
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.netlist.tsv b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.netlist.tsv
index 831e7e9..211d2a0 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o21bai_2	A1:I A2:I B1_N: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.spice b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.spice
index c276b3f..bd38aee 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.spice
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__o21bai_2 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_507_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.776e+11p pd=5.69e+06u as=1.44e+12p ps=9.33e+06u
-M1001 a_225_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=8.88e+11p pd=8.32e+06u as=6.708e+11p ps=6.13e+06u
-M1002 a_225_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A2 a_507_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1004 VGND A1 a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_225_74# a_27_74# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1006 Y a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_507_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_507_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_27_74# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1_N a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.05e+11p ps=2.61e+06u
-M1012 VGND B1_N a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1013 Y a_27_74# a_225_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_507_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND A1 a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_225_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_225_74# a_27_74# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR a_27_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y a_27_74# a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y A2 a_507_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR A1 a_507_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND A2 a_225_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_225_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_74# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_27_74# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_507_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.cdl b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.cdl
index a32ace6..79d76d4 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.cdl
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o21bai_4 A1 A2 B1_N VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1_N:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=2 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMIPB1N B1 B1_N VPB phighvt m=2 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 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
-MMINB1N B1 B1_N 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
+MMINB1N B1 B1_N 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_ls__o21bai_4
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.netlist.tsv b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.netlist.tsv
index 2077952..f664661 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o21bai_4	A1:I A2:I B1_N: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	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/o21bai/sky130_fd_sc_ls__o21bai_4.spice b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.spice
index beb3c0c..1b596ad 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.spice
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.spice
@@ -16,54 +16,29 @@
 
 
 .subckt sky130_fd_sc_ls__o21bai_4 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR a_828_48# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.5204e+12p pd=1.309e+07u as=1.3888e+12p ps=1.144e+07u
-M1001 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.6132e+12p pd=1.472e+07u as=1.2473e+12p ps=1.099e+07u
-M1002 Y a_828_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=0p ps=0u
-M1003 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B1_N a_828_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1006 Y A2 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.7248e+12p ps=1.428e+07u
-M1007 VPWR B1_N a_828_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1008 a_27_74# a_828_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_28_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_28_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A2 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y a_828_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_28_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_28_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_828_48# B1_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_828_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_74# a_828_48# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_828_48# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR B1_N a_828_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_28_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_28_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR a_828_48# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y A2 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y a_828_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_74# a_828_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y a_828_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_828_48# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 Y A2 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 Y a_828_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_27_74# a_828_48# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_1.cdl b/cells/o221a/sky130_fd_sc_ls__o221a_1.cdl
index f9ab983..1c13c2c 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_1.cdl
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o221a_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o221a_1
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_1.netlist.tsv b/cells/o221a/sky130_fd_sc_ls__o221a_1.netlist.tsv
index 58b9d22..788c3f8 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_1.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o221a_1	A1:I A2:I B1:I B2:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o221a/sky130_fd_sc_ls__o221a_1.spice b/cells/o221a/sky130_fd_sc_ls__o221a_1.spice
index 5eaf1f8..a66622b 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_1.spice
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o221a_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_245_94# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=4.931e+11p ps=4.19e+06u
-M1001 VGND a_83_264# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1002 a_83_264# A2 a_264_392# VPB phighvt w=1e+06u l=150000u
-+  ad=7.15e+11p pd=5.43e+06u as=2.7e+11p ps=2.54e+06u
-M1003 a_83_264# C1 a_456_74# VNB nshort w=640000u l=150000u
-+  ad=2.944e+11p pd=2.2e+06u as=4.576e+11p ps=3.99e+06u
-M1004 a_264_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=1.4818e+12p ps=7.14e+06u
-M1005 a_456_74# B1 a_245_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_83_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1007 VPWR B1 a_462_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=4.2e+11p ps=2.84e+06u
-M1008 a_462_392# B2 a_83_264# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_83_264# C1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_245_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_245_94# B2 a_456_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_264_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND A1 a_245_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR C1 a_83_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_456_74# B2 a_245_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_245_94# B1 a_456_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_83_264# B2 a_462_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_462_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_245_94# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_264_392# A2 a_83_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_456_74# C1 a_83_264# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_2.cdl b/cells/o221a/sky130_fd_sc_ls__o221a_2.cdl
index 4dd5d12..5c9706c 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_2.cdl
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o221a_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNB1 pndB B2 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
-MMNC0 y C1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o221a_2
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_2.netlist.tsv b/cells/o221a/sky130_fd_sc_ls__o221a_2.netlist.tsv
index 321fd8c..eba31ad 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_2.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o221a_2	A1:I A2:I B1:I B2:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_2.spice b/cells/o221a/sky130_fd_sc_ls__o221a_2.spice
index 3311f34..a9109a3 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_2.spice
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__o221a_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 X a_27_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=1.8518e+12p ps=1.003e+07u
-M1001 a_165_74# B2 a_264_74# VNB nshort w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=4.699e+11p ps=4.23e+06u
-M1002 a_530_368# A2 a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=4.2e+11p pd=2.84e+06u as=7.15e+11p ps=5.43e+06u
-M1003 VGND A1 a_264_74# VNB nshort w=740000u l=150000u
-+  ad=8.325e+11p pd=6.69e+06u as=0p ps=0u
-M1004 VPWR a_27_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_165_74# C1 a_27_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1006 X a_27_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1007 a_264_74# B1 a_165_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_264_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_332_368# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1010 VPWR C1 a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_530_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_368# B2 a_332_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_332_368# B2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_27_368# A2 a_530_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_264_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND a_27_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_530_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 X a_27_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_165_74# B1 a_264_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_27_368# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_27_368# C1 a_165_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_27_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VPWR B1 a_332_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND A2 a_264_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_264_74# B2 a_165_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 X a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_4.cdl b/cells/o221a/sky130_fd_sc_ls__o221a_4.cdl
index ef61d07..ee053cc 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_4.cdl
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o221a_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o221a_4
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_4.netlist.tsv b/cells/o221a/sky130_fd_sc_ls__o221a_4.netlist.tsv
index 608d48e..0bafd77 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_4.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o221a_4	A1:I A2:I B1:I B2:I C1: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_4.spice b/cells/o221a/sky130_fd_sc_ls__o221a_4.spice
index 02c4915..55210c0 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_4.spice
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__o221a_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_27_125# B1 a_300_125# VNB nshort w=640000u l=150000u
-+  ad=7.904e+11p pd=7.59e+06u as=7.456e+11p ps=7.45e+06u
-M1001 a_297_387# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.45e+11p pd=5.29e+06u as=2.4382e+12p ps=1.739e+07u
-M1002 VGND a_114_125# X VNB nshort w=740000u l=150000u
-+  ad=1.2421e+12p pd=1.053e+07u as=4.181e+11p ps=4.09e+06u
-M1003 a_300_125# B2 a_27_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_114_125# A2 a_763_387# VPB phighvt w=1e+06u l=150000u
-+  ad=9.25e+11p pd=7.85e+06u as=6.75e+11p ps=5.35e+06u
-M1005 X a_114_125# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_114_125# B2 a_297_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_300_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_300_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_763_387# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_300_125# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_114_125# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=8.176e+11p ps=5.94e+06u
-M1012 a_300_125# B1 a_27_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_297_387# B2 a_114_125# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_125# C1 a_114_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1015 a_114_125# C1 a_27_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_300_125# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_114_125# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_114_125# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B1 a_297_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_114_125# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_114_125# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_125# B2 a_300_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_114_125# C1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR C1 a_114_125# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_763_387# A2 a_114_125# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_114_125# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A1 a_763_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C1 a_114_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 X a_114_125# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_297_387# B2 a_114_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VGND a_114_125# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_125# C1 a_114_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VGND a_114_125# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_763_387# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_763_387# A2 a_114_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_114_125# A2 a_763_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_300_125# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 X a_114_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 X a_114_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_114_125# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 X a_114_125# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_114_125# B2 a_297_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VPWR A1 a_763_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_114_125# C1 a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VGND A1 a_300_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_300_125# B2 a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_27_125# B2 a_300_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_27_125# B1 a_300_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_300_125# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_300_125# B1 a_27_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 VPWR a_114_125# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VPWR a_114_125# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VPWR B1 a_297_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 a_297_387# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X27 VGND A2 a_300_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.cdl b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.cdl
index 96e3fbf..6212b14 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.cdl
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o221ai_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 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
-MMPC0 VPWR C1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNB1 pndB B2 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
-MMNC0 Y C1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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_ls__o221ai_1
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.netlist.tsv b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.netlist.tsv
index 4ce4bc8..3491563 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o221ai_1	A1:I A2:I B1:I B2:I C1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.spice b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.spice
index 2961115..1404241 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.spice
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o221ai_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.1816e+12p pd=6.59e+06u as=8.008e+11p ps=5.91e+06u
-M1001 VGND A2 a_239_74# VNB nshort w=740000u l=150000u
-+  ad=4.736e+11p pd=2.76e+06u as=6.808e+11p ps=6.28e+06u
-M1002 a_239_74# B2 a_114_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=5.217e+11p ps=4.37e+06u
-M1003 a_114_74# B1 a_239_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_522_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.704e+11p pd=3.08e+06u as=0p ps=0u
-M1005 a_239_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_522_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B2 a_324_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.78e+06u
-M1008 a_114_74# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_324_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_239_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_324_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_114_74# B2 a_239_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR B1 a_324_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_522_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_239_74# B1 a_114_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND A1 a_239_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y C1 a_114_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y A2 a_522_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.cdl b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.cdl
index 9991575..58d379b 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.cdl
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o221ai_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 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
-MMPC0 VPWR C1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNB1 pndB B2 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
-MMNC0 Y C1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__o221ai_2
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.netlist.tsv b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.netlist.tsv
index ffbeece..ef074da 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o221ai_2	A1:I A2:I B1:I B2:I C1: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.spice b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.spice
index 7f963f9..ea27e2d 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.spice
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__o221ai_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_376_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.672e+11p pd=5.85e+06u as=1.904e+12p ps=1.236e+07u
-M1001 Y A2 a_776_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0248e+12p pd=8.55e+06u as=7.28e+11p ps=5.78e+06u
-M1002 a_311_85# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=1.0841e+12p pd=1.033e+07u as=5.328e+11p ps=4.4e+06u
-M1003 VGND A1 a_311_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_776_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# B2 a_311_85# VNB nshort w=740000u l=150000u
-+  ad=9.287e+11p pd=8.43e+06u as=0p ps=0u
-M1006 VPWR A1 a_776_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_376_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_311_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B2 a_376_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B1 a_311_85# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_311_85# B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 a_376_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1016 a_27_74# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_311_85# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_776_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_311_85# B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_376_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_776_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_311_85# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y C1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y A2 a_776_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_311_85# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y B2 a_376_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_74# B2 a_311_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_311_85# B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_776_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND A1 a_311_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND A2 a_311_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_27_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_376_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VPWR A1 a_776_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_74# B1 a_311_85# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_311_85# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR B1 a_376_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.cdl b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.cdl
index 25f36d3..c228526 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.cdl
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o221ai_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPB1 sndB1 B2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 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
-MMPC0 VPWR C1 VPB phighvt 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 pndB B1 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
-MMNB1 pndB B2 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
-MMNC0 Y C1 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__o221ai_4
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.netlist.tsv b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.netlist.tsv
index 3ac8317..ae48185 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o221ai_4	A1:I A2:I B1:I B2:I C1: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.spice b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.spice
index d5e351c..87214b2 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.spice
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__o221ai_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 a_27_84# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=1.4578e+12p ps=1.43e+07u
-M1001 a_508_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4e+12p pd=1.146e+07u as=2.716e+12p ps=2.053e+07u
-M1002 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.1e+12p pd=1.719e+07u as=0p ps=0u
-M1003 a_483_74# B2 a_27_84# VNB nshort w=740000u l=150000u
-+  ad=1.9758e+12p pd=1.866e+07u as=0p ps=0u
-M1004 VGND A2 a_483_74# VNB nshort w=740000u l=150000u
-+  ad=9.916e+11p pd=8.6e+06u as=0p ps=0u
-M1005 a_483_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B2 a_508_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A2 a_1288_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.4056e+12p ps=1.147e+07u
-M1008 a_27_84# B1 a_483_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_84# B1 a_483_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_508_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_483_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 a_508_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1288_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1 a_508_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_483_74# B2 a_27_84# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_508_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_84# B2 a_483_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_483_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1288_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_1288_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C1 a_27_84# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A2 a_483_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A1 a_1288_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B2 a_508_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A2 a_1288_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_84# B2 a_483_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND A1 a_483_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_483_74# B1 a_27_84# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A1 a_483_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1288_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_483_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_483_74# B1 a_27_84# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_508_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1288_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_27_84# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_27_84# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_508_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR B1 a_508_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_1288_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR A1 a_1288_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_483_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A2 a_483_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y A2 a_1288_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_84# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y C1 a_27_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y A2 a_1288_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y B2 a_508_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_508_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_483_74# B2 a_27_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_483_74# B1 a_27_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND A2 a_483_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_483_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_27_84# B2 a_483_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_27_84# B1 a_483_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_483_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_508_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_483_74# B2 a_27_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_508_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 VPWR A1 a_1288_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_27_84# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_27_84# B2 a_483_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_483_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 VPWR B1 a_508_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 VGND A1 a_483_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_1288_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 a_27_84# B1 a_483_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 a_1288_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 a_483_74# B1 a_27_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 a_1288_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 VGND A1 a_483_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 Y C1 a_27_84# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 Y B2 a_508_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_1.cdl b/cells/o22a/sky130_fd_sc_ls__o22a_1.cdl
index 248e9cc..c1ffbc3 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_1.cdl
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_1.netlist.tsv b/cells/o22a/sky130_fd_sc_ls__o22a_1.netlist.tsv
index 94cd48d..6c0a801 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_1.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o22a/sky130_fd_sc_ls__o22a_1.spice b/cells/o22a/sky130_fd_sc_ls__o22a_1.spice
index 7632c78..9cc7b27 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_1.spice
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o22a_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_398_392# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.5868e+12p ps=7.35e+06u
-M1001 a_572_392# A2 a_83_260# VPB phighvt w=1e+06u l=150000u
-+  ad=3.9e+11p pd=2.78e+06u as=3e+11p ps=2.6e+06u
-M1002 a_299_139# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=5.3175e+11p pd=5.54e+06u as=5.00375e+11p ps=4.3e+06u
-M1003 a_83_260# B1 a_299_139# VNB nshort w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=0p ps=0u
-M1004 VPWR A1 a_572_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_299_139# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1007 a_299_139# B2 a_83_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_83_260# B2 a_398_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_299_139# B1 a_83_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_299_139# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_572_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_83_260# A2 a_572_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_83_260# B2 a_299_139# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR B1 a_398_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VGND A1 a_299_139# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_398_392# B2 a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_2.cdl b/cells/o22a/sky130_fd_sc_ls__o22a_2.cdl
index 44e9d23..8d06eea 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_2.cdl
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o22a_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 y B1 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
-MMNB1 y B2 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o22a_2
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_2.netlist.tsv b/cells/o22a/sky130_fd_sc_ls__o22a_2.netlist.tsv
index cb0fda2..8395dae 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_2.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o22a_2	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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_2.spice b/cells/o22a/sky130_fd_sc_ls__o22a_2.spice
index 293df9d..24e27b8 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_2.spice
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o22a_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR a_82_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.3764e+12p pd=9.08e+06u as=3.36e+11p ps=2.84e+06u
-M1001 a_383_384# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1002 a_82_48# B1 a_307_74# VNB nshort w=740000u l=150000u
-+  ad=2.294e+11p pd=2.1e+06u as=6.649e+11p ps=6.26e+06u
-M1003 X a_82_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_82_48# B2 a_383_384# VPB phighvt w=1e+06u l=150000u
-+  ad=3.6e+11p pd=2.72e+06u as=0p ps=0u
-M1005 a_575_384# A2 a_82_48# VPB phighvt w=1e+06u l=150000u
-+  ad=3.9e+11p pd=2.78e+06u as=0p ps=0u
-M1006 X a_82_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=6.5575e+11p ps=6.24e+06u
-M1007 a_307_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_82_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_575_384# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_307_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_307_74# B2 a_82_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_82_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_82_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_307_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_82_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_383_384# B2 a_82_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_307_74# B1 a_82_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_575_384# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VGND a_82_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_82_48# B2 a_307_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_82_48# A2 a_575_384# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 VPWR B1 a_383_384# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND A1 a_307_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_4.cdl b/cells/o22a/sky130_fd_sc_ls__o22a_4.cdl
index a5b0783..3d407af 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_4.cdl
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o22a_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o22a_4
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_4.netlist.tsv b/cells/o22a/sky130_fd_sc_ls__o22a_4.netlist.tsv
index 378f244..0b88436 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_4.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o22a_4	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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_4.spice b/cells/o22a/sky130_fd_sc_ls__o22a_4.spice
index 02522b3..dbc09af 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_4.spice
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__o22a_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 X a_206_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.112e+11p pd=5.75e+06u as=2.1626e+12p ps=1.475e+07u
-M1001 a_27_136# B1 a_206_392# VNB nshort w=640000u l=150000u
-+  ad=1.0112e+12p pd=9.56e+06u as=3.616e+11p ps=3.69e+06u
-M1002 VGND a_206_392# X VNB nshort w=740000u l=150000u
-+  ad=1.1945e+12p pd=1.055e+07u as=4.144e+11p ps=4.08e+06u
-M1003 VPWR A1 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6.5e+11p ps=5.3e+06u
-M1004 VGND a_206_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_516_392# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.5e+11p pd=5.3e+06u as=0p ps=0u
-M1006 a_206_392# B2 a_27_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_206_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_206_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_206_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_206_392# B2 a_516_392# VPB phighvt w=1e+06u l=150000u
-+  ad=7e+11p pd=5.4e+06u as=0p ps=0u
-M1011 a_27_136# B2 a_206_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_136# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_206_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_27_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A1 a_27_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_136# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_206_392# A2 a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_116_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_516_392# B2 a_206_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_206_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_206_392# B1 a_27_136# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_116_392# A2 a_206_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_516_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_206_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_206_392# B2 a_516_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 X a_206_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_206_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_206_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_206_392# A2 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 X a_206_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_136# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_206_392# B1 a_27_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VGND a_206_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_516_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_116_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VPWR B1 a_516_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_27_136# B1 a_206_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 X a_206_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 X a_206_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_206_392# B2 a_27_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_27_136# B2 a_206_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 VGND A2 a_27_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VGND A1 a_27_136# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 VPWR A1 a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_516_392# B2 a_206_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 a_27_136# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_116_392# A2 a_206_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.cdl b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.cdl
index 28dd222..a0e48cb 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.cdl
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMPB1 sndB1 B2 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 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
-MMNB1 Y B2 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 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_ls__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.netlist.tsv b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.netlist.tsv
index ffd8f27..e1c8ac0 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.spice b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.spice
index 19f30fb..815a840 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.spice
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__o22ai_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_142_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.024e+11p pd=2.78e+06u as=7.952e+11p ps=5.9e+06u
-M1001 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=6.808e+11p ps=6.28e+06u
-M1002 a_27_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.255e+11p ps=2.63e+06u
-M1003 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_340_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=3.08e+06u
-M1005 Y B2 a_142_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.704e+11p pd=3.08e+06u as=0p ps=0u
-M1006 a_340_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_142_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y A2 a_340_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_340_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR B1 a_142_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.cdl b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.cdl
index e67d713..a848abb 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.cdl
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o22ai_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMPB1 sndB1 B2 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 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
-MMNB1 Y B2 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 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
 .ENDS sky130_fd_sc_ls__o22ai_2
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.netlist.tsv b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.netlist.tsv
index 9d68c66..0697cac 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o22ai_2	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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.spice b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.spice
index 3b6458d..675485f 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.spice
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__o22ai_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=1.4282e+12p pd=1.126e+07u as=4.958e+11p ps=4.3e+06u
-M1001 Y A2 a_510_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=9.968e+11p ps=8.5e+06u
-M1002 a_27_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=5.402e+11p ps=4.42e+06u
-M1003 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_510_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.28e+11p pd=5.78e+06u as=9.968e+11p ps=8.5e+06u
-M1008 a_28_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_510_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B2 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_510_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_28_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_510_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_28_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_510_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A1 a_510_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_28_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 Y B2 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 Y A2 a_510_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR B1 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.cdl b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.cdl
index 772353e..84b8c36 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.cdl
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o22ai_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMPB1 sndB1 B2 VPB phighvt 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNB0 Y B1 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
-MMNB1 Y B2 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 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
 .ENDS sky130_fd_sc_ls__o22ai_4
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.netlist.tsv b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.netlist.tsv
index 3d782a6..c6bcb82 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o22ai_4	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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.spice b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.spice
index 0e19c5d..a2bd61c 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.spice
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__o22ai_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_877_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4448e+12p pd=1.154e+07u as=1.8928e+12p ps=1.458e+07u
-M1001 a_117_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.344e+12p pd=1.136e+07u as=1.4112e+12p ps=1.148e+07u
-M1002 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=2.0566e+12p pd=1.9e+07u as=1.0582e+12p ps=8.78e+06u
-M1003 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=9.768e+11p ps=8.56e+06u
-M1004 VPWR B1 a_877_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_877_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A2 a_117_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_117_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_117_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B2 a_877_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_117_368# A2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_877_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_117_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_877_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A1 a_117_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A2 a_117_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B2 a_877_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR B1 a_877_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_877_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A1 a_117_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_117_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR B1 a_877_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_117_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y B2 a_877_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR A1 a_117_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_117_368# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_877_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 Y A2 a_117_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 Y A2 a_117_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VPWR B1 a_877_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_117_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_877_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 Y B2 a_877_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_877_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.cdl b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.cdl
index 45a2199..4b7c81e 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o2bb2a_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB 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
-MMPnand0 inand A1_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi20 y inand VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB 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
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB 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
+MMPnand1 inand A2_N VPB 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
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=0.84 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_ls__o2bb2a_1
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.netlist.tsv
index 7c05ca8..cc43ffd 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o2bb2a_1	A1_N:I A2_N: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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inand	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.spice b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.spice
index 90f26ae..03662e8 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.spice
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o2bb2a_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_233_384# A1_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.982e+11p pd=2.39e+06u as=1.704e+12p ps=9.65e+06u
-M1001 VPWR A2_N a_233_384# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=6.211e+11p pd=4.59e+06u as=2.109e+11p ps=2.05e+06u
-M1003 a_253_94# A1_N VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1004 a_233_384# A2_N a_253_94# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1005 a_588_74# a_233_384# a_83_260# VNB nshort w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=1.824e+11p ps=1.85e+06u
-M1006 VPWR B1 a_693_384# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1007 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1008 a_83_260# a_233_384# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.448e+11p pd=2.72e+06u as=0p ps=0u
-M1009 a_693_384# B2 a_83_260# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_588_74# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B2 a_588_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_693_384# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_253_94# A2_N a_233_384# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_83_260# B2 a_693_384# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND A1_N a_253_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A1_N a_233_384# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 VGND B1 a_588_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VPWR a_233_384# a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_233_384# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_83_260# a_233_384# a_588_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_588_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.cdl b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.cdl
index 124df04..bc638ca 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o2bb2a_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 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
-MMNaoi11 nmid B2 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
-MMNaoi20 y inand 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
-MMIP2 X y VPB 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
-MMPnand0 inand A1_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 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
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 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
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MMNaoi20 y inand 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
-MMPaoi20 y inand VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X y VPB 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
+MMPnand0 inand A1_N VPB 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
+MMPnand1 inand A2_N VPB 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
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=1.0 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_ls__o2bb2a_2
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.netlist.tsv
index b1382e6..5a9aad0 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o2bb2a_2	A1_N:I A2_N: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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inand	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.spice b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.spice
index 7dad4e6..bf770f2 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.spice
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__o2bb2a_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_270_48# A2_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=1.77315e+12p ps=1.217e+07u
-M1001 a_201_392# B2 a_117_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.6e+11p pd=2.72e+06u as=2.7e+11p ps=2.54e+06u
-M1002 VPWR a_270_48# a_201_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_201_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=7.087e+11p ps=6.4e+06u
-M1004 VPWR A1_N a_270_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_201_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1006 a_500_74# A2_N a_270_48# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1007 a_117_392# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_201_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_201_392# a_270_48# a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=4.699e+11p ps=4.23e+06u
-M1010 VGND A1_N a_500_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_201_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_201_392# a_270_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_500_74# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_270_48# A2_N a_500_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VGND a_201_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_201_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR B1 a_117_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_117_392# B2 a_201_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 X a_201_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_270_48# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_27_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR A2_N a_270_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_27_74# a_270_48# a_201_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 X a_201_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.cdl b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.cdl
index 8154041..cbe3d71 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o2bb2a_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN2 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt 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
-MMPnand0 inand A1_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi20 y inand VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB 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
-MMPaoi11 sndPB1 B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB 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
+MMPnand1 inand A2_N VPB 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
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 y inand VPB pfet_01v8_hvt m=2 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
 .ENDS sky130_fd_sc_ls__o2bb2a_4
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.netlist.tsv
index 62bc567..77d6673 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o2bb2a_4	A1_N:I A2_N: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
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inand	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.spice b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.spice
index 8802c12..48692dd 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.spice
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__o2bb2a_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 X a_310_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.896e+11p pd=5.89e+06u as=2.379e+12p ps=1.765e+07u
-M1001 a_27_74# a_476_48# a_310_392# VNB nshort w=640000u l=150000u
-+  ad=7.648e+11p pd=7.51e+06u as=2.016e+11p ps=1.91e+06u
-M1002 X a_310_392# VGND VNB nshort w=740000u l=150000u
-+  ad=5.217e+11p pd=4.37e+06u as=1.3531e+12p ps=1.093e+07u
-M1003 VPWR a_310_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_310_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_74# B2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_41_392# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=8.9e+11p pd=7.78e+06u as=0p ps=0u
-M1007 VGND B2 a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A1_N a_835_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1009 VGND a_310_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_41_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_310_392# B2 a_41_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.108e+11p pd=5.02e+06u as=0p ps=0u
-M1012 VPWR A1_N a_476_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1013 X a_310_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_476_48# a_310_392# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_41_392# B2 a_310_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_476_48# A2_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_310_392# a_476_48# a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_835_94# A2_N a_476_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.952e+11p ps=1.89e+06u
-M1019 a_310_392# a_476_48# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_310_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND B1 a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_74# B1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_310_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_310_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_310_392# B2 a_41_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR B1 a_41_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_476_48# A2_N a_835_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_41_392# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_835_94# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VGND a_310_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 X a_310_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_310_392# a_476_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VGND B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_27_74# a_476_48# a_310_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_27_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_476_48# a_310_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 X a_310_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_41_392# B2 a_310_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_476_48# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 VGND a_310_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 X a_310_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR A2_N a_476_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 VPWR a_310_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 X a_310_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_27_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_310_392# a_476_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.cdl b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.cdl
index d7fcf78..da1cf12 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o2bb2ai_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 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
-MMNaoi11 nmid B2 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
-MMNaoi20 Y inand 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
-MMPnand0 inand A1_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 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
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 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
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand 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
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB 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
+MMPnand1 inand A2_N VPB 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
+MMPaoi10 VPWR B1 VPB 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
-MMPaoi20 Y inand VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB 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
+MMPaoi20 Y inand VPB 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
 .ENDS sky130_fd_sc_ls__o2bb2ai_1
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.netlist.tsv
index 4f40c19..c00e8dd 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o2bb2ai_1	A1_N:I A2_N: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
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.spice b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.spice
index dfa8c88..474b1af 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o2bb2ai_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_397_74# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=4.699e+11p pd=4.23e+06u as=3.896e+11p ps=3.89e+06u
-M1001 a_131_383# A2_N a_114_74# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1002 VPWR B1 a_490_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.36223e+12p pd=8.93e+06u as=3.696e+11p ps=2.9e+06u
-M1003 Y a_131_383# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1004 VPWR A2_N a_131_383# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1005 VGND B2 a_397_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_490_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_397_74# a_131_383# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1008 a_131_383# A1_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_114_74# A1_N VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_490_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_397_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND B1 a_397_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_131_383# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR A1_N a_131_383# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 Y B2 a_490_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y a_131_383# a_397_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_114_74# A2_N a_131_383# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND A1_N a_114_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VPWR a_131_383# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.cdl b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.cdl
index bc4f707..76f75e6 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o2bb2ai_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 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
-MMNaoi11 nmid B2 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
-MMNaoi20 Y inand 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
-MMPnand0 inand A1_N VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 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
-MMPnand1 inand A2_N VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 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
-MMPaoi10 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand 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
-MMPaoi11 sndPB1 B2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=2 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
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=2 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
+MMPaoi10 VPWR B1 VPB 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
-MMPaoi20 Y inand VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB 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
+MMPaoi20 Y inand VPB 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
 .ENDS sky130_fd_sc_ls__o2bb2ai_2
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.netlist.tsv
index 46ab501..20170eb 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o2bb2ai_2	A1_N:I A2_N: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
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.spice b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.spice
index f146fed..e5a63af 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__o2bb2ai_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_796_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.888e+11p pd=5.71e+06u as=6.72e+11p ps=5.68e+06u
-M1001 VGND B2 a_518_74# VNB nshort w=740000u l=150000u
-+  ad=8.869e+11p pd=8.09e+06u as=8.954e+11p ps=8.34e+06u
-M1002 VPWR A2_N a_133_387# VPB phighvt w=840000u l=150000u
-+  ad=2.15495e+12p pd=1.515e+07u as=5.96625e+11p ps=4.94e+06u
-M1003 a_796_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_518_74# a_133_387# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1005 VPWR A1_N a_133_387# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_134_74# A1_N VGND VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1007 a_133_387# A2_N a_134_74# VNB nshort w=640000u l=150000u
-+  ad=2.272e+11p pd=1.99e+06u as=0p ps=0u
-M1008 a_133_387# A1_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_133_387# A2_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_796_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_518_74# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_133_387# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_133_387# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A1_N a_134_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_518_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_796_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B1 a_518_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_134_74# A2_N a_133_387# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y a_133_387# a_518_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_133_387# A2_N a_134_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND B1 a_518_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR A2_N a_133_387# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 Y B2 a_796_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A1_N a_134_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VGND B2 a_518_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR B1 a_796_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_518_74# a_133_387# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y a_133_387# a_518_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_796_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_134_74# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_518_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y a_133_387# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_133_387# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_518_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_133_387# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VPWR A1_N a_133_387# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_134_74# A2_N a_133_387# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_796_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VPWR a_133_387# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.cdl b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.cdl
index 524aaa2..1cb09ab 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o2bb2ai_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1_N:I A2_N:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A1_N VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N 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
-MMNnand1 sndNA1N A2_N VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N 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
-MMNaoi10 nmid B1 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
-MMNaoi11 nmid B2 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
-MMNaoi20 Y inand 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
-MMPnand0 inand A1_N VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 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
-MMPnand1 inand A2_N VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 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
-MMPaoi10 VPWR B1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand 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
-MMPaoi11 sndPB1 B2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB 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
+MMPnand1 inand A2_N VPB 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
+MMPaoi10 VPWR B1 VPB 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
-MMPaoi20 Y inand VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB 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
+MMPaoi20 Y inand VPB 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
 .ENDS sky130_fd_sc_ls__o2bb2ai_4
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.netlist.tsv
index edb1705..b64b557 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o2bb2ai_4	A1_N:I A2_N: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
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.spice b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.spice
index 9ead0cc..f4202a0 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__o2bb2ai_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_114_368# A1_N VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.344e+12p pd=1.136e+07u as=2.9904e+12p ps=2.55e+07u
-M1001 Y B2 a_1215_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.344e+12p pd=1.136e+07u as=1.6464e+12p ps=1.414e+07u
-M1002 a_857_74# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=1.4578e+12p pd=1.43e+07u as=1.3986e+12p ps=1.266e+07u
-M1003 a_27_74# A2_N a_114_368# VNB nshort w=740000u l=150000u
-+  ad=1.1211e+12p pd=1.043e+07u as=4.477e+11p ps=4.17e+06u
-M1004 a_857_74# a_114_368# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.144e+11p ps=4.08e+06u
-M1005 VPWR A2_N a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_114_368# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_74# A1_N VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B1 a_857_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1215_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1_N a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 a_857_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_114_368# A2_N a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1215_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_114_368# a_857_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_114_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_114_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR B1 a_1215_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_114_368# A2_N VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_114_368# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B2 a_1215_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_114_368# A2_N a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_857_74# a_114_368# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_857_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1215_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A2_N a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND B2 a_857_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1215_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_114_368# a_857_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_114_368# A1_N VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A1_N a_114_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A1_N a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_74# A1_N VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND A1_N a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_857_74# B1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_857_74# B2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_114_368# A2_N VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_74# A2_N a_114_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR B1 a_1215_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND B2 a_857_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_1215_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A2_N a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR B1 a_1215_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 Y a_114_368# a_857_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VPWR A1_N a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_857_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Y B2 a_1215_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND A1_N a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_74# A2_N a_114_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_114_368# A2_N a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR a_114_368# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y B2 a_1215_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR A1_N a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_114_368# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Y a_114_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_857_74# a_114_368# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_114_368# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_1215_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_114_368# A2_N a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VGND B2 a_857_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_857_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VGND B1 a_857_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_114_368# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_1215_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_114_368# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_1215_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_1215_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_27_74# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 Y a_114_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_857_74# a_114_368# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 VGND B2 a_857_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_27_74# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_857_74# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 VGND B1 a_857_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VPWR a_114_368# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 VGND A1_N a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 Y a_114_368# a_857_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 a_857_74# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 a_27_74# A2_N a_114_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 VPWR A2_N a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_1.cdl b/cells/o311a/sky130_fd_sc_ls__o311a_1.cdl
index 5b0d1ed..ca355dc 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_1.cdl
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o311a_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o311a_1
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_1.netlist.tsv b/cells/o311a/sky130_fd_sc_ls__o311a_1.netlist.tsv
index ba9aa16..93c1667 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_1.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o311a_1	A1:I A2:I A3:I B1:I C1: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o311a/sky130_fd_sc_ls__o311a_1.spice b/cells/o311a/sky130_fd_sc_ls__o311a_1.spice
index 3164063..2018fa7 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_1.spice
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o311a_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 X a_31_387# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=9.038e+11p ps=5.98e+06u
-M1001 a_209_74# B1 a_131_74# VNB nshort w=640000u l=150000u
-+  ad=8.448e+11p pd=5.2e+06u as=1.536e+11p ps=1.76e+06u
-M1002 a_131_74# C1 a_31_387# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1003 a_209_74# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=6.202e+11p ps=4.62e+06u
-M1004 X a_31_387# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 VGND A2 a_209_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C1 a_31_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.95e+11p ps=5.19e+06u
-M1007 VPWR A1 a_536_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=4.2e+11p ps=2.84e+06u
-M1008 a_320_387# A3 a_31_387# VPB phighvt w=1e+06u l=150000u
-+  ad=9.3e+11p pd=3.86e+06u as=0p ps=0u
-M1009 a_31_387# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_536_387# A2 a_320_387# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A1 a_209_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_209_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND a_31_387# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_31_387# C1 a_131_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_536_387# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_31_387# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_131_74# B1 a_209_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_209_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VGND A3 a_209_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VPWR a_31_387# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_31_387# A3 a_320_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_320_387# A2 a_536_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VPWR B1 a_31_387# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_2.cdl b/cells/o311a/sky130_fd_sc_ls__o311a_2.cdl
index 11d6952..8f8692f 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_2.cdl
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o311a_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 pndB B1 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
-MMNC0 y C1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o311a_2
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_2.netlist.tsv b/cells/o311a/sky130_fd_sc_ls__o311a_2.netlist.tsv
index bd1d99d..3343719 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_2.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o311a_2	A1:I A2:I A3:I B1:I C1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_2.spice b/cells/o311a/sky130_fd_sc_ls__o311a_2.spice
index 8262d94..fc33d3e 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_2.spice
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__o311a_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_135_74# C1 a_32_74# VNB nshort w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=2.701e+11p ps=2.21e+06u
-M1001 VGND A3 a_219_74# VNB nshort w=740000u l=150000u
-+  ad=1.1042e+12p pd=7.58e+06u as=4.958e+11p ps=4.3e+06u
-M1002 a_32_74# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=7.204e+11p pd=5.61e+06u as=1.2936e+12p ps=8.88e+06u
-M1003 X a_32_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 X a_32_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1005 a_444_368# A2 a_360_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.368e+11p pd=3.02e+06u as=3.024e+11p ps=2.78e+06u
-M1006 VPWR C1 a_32_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_219_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_32_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_360_368# A3 a_32_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_32_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_444_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_219_74# B1 a_135_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_219_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_32_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_32_74# C1 a_135_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_135_74# B1 a_219_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VGND a_32_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 X a_32_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_219_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_32_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND A2 a_219_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_32_74# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_444_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_360_368# A2 a_444_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_219_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_32_74# A3 a_360_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR B1 a_32_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_4.cdl b/cells/o311a/sky130_fd_sc_ls__o311a_4.cdl
index 6660598..de03e16 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_4.cdl
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o311a_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPC0 VPWR C1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o311a_4
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_4.netlist.tsv b/cells/o311a/sky130_fd_sc_ls__o311a_4.netlist.tsv
index b504d62..7742c22 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_4.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o311a_4	A1:I A2:I A3:I B1:I C1: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_4.spice b/cells/o311a/sky130_fd_sc_ls__o311a_4.spice
index 8bd5cf2..0fcd1ce 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_4.spice
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__o311a_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_83_244# A3 a_1034_392# VPB phighvt w=1e+06u l=150000u
-+  ad=1.09e+12p pd=8.18e+06u as=1.075e+12p ps=8.15e+06u
-M1001 a_1338_392# A2 a_1034_392# VPB phighvt w=1e+06u l=150000u
-+  ad=7.4e+11p pd=5.48e+06u as=0p ps=0u
-M1002 a_564_78# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=1.02922e+12p pd=9.63e+06u as=1.5521e+12p ps=1.276e+07u
-M1003 a_651_78# B1 a_564_78# VNB nshort w=640000u l=150000u
-+  ad=6.88e+11p pd=4.71e+06u as=0p ps=0u
-M1004 X a_83_244# VGND VNB nshort w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=0p ps=0u
-M1005 VGND a_83_244# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_564_78# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_83_244# C1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.4192e+12p ps=1.734e+07u
-M1008 a_83_244# C1 a_651_78# VNB nshort w=640000u l=150000u
-+  ad=3.4395e+11p pd=2.59e+06u as=0p ps=0u
-M1009 X a_83_244# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=8.792e+11p pd=6.05e+06u as=0p ps=0u
-M1010 VPWR a_83_244# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 a_83_244# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_564_78# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_83_244# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A2 a_564_78# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR C1 a_83_244# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_1338_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_651_78# C1 a_83_244# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A3 a_564_78# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_83_244# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1034_392# A2 a_1338_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_83_244# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_83_244# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1034_392# A3 a_83_244# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_564_78# B1 a_651_78# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A1 a_564_78# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_83_244# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1338_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_1338_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR a_83_244# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_1034_392# A2 a_1338_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_83_244# C1 a_651_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_564_78# B1 a_651_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 X a_83_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_564_78# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR B1 a_83_244# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VPWR a_83_244# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND a_83_244# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_83_244# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_83_244# A3 a_1034_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_1338_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_564_78# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 VGND a_83_244# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR C1 a_83_244# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_1338_392# A2 a_1034_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_651_78# B1 a_564_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_564_78# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VGND A2 a_564_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 X a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 X a_83_244# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_83_244# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 VGND A1 a_564_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 X a_83_244# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_1034_392# A3 a_83_244# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 a_651_78# C1 a_83_244# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VGND A3 a_564_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.cdl b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.cdl
index f8e04fe..a92c516 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.cdl
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o311ai_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 pndB B1 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
-MMNC0 Y C1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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_ls__o311ai_1
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.netlist.tsv b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.netlist.tsv
index ddb944d..dabe5fb 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o311ai_1	A1:I A2:I A3:I B1:I C1: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.spice b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.spice
index fc440d9..52a0be5 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.spice
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o311ai_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 a_469_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.294e+11p ps=2.1e+06u
-M1001 Y A3 a_222_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=8.008e+11p pd=5.91e+06u as=4.704e+11p ps=3.08e+06u
-M1002 a_128_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=4.847e+11p pd=4.27e+06u as=7.067e+11p ps=4.87e+06u
-M1003 a_138_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.024e+11p pd=2.78e+06u as=8.008e+11p ps=5.91e+06u
-M1004 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_469_74# B1 a_128_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_128_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_222_368# A2 a_138_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_128_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_138_368# A2 a_222_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_128_74# B1 a_469_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_469_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_128_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A1 a_128_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A1 a_138_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A3 a_128_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_222_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.cdl b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.cdl
index 8301812..994e5d9 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.cdl
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o311ai_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 pndB B1 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
-MMNC0 Y C1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__o311ai_2
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.netlist.tsv b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.netlist.tsv
index 83f9e43..2533630 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o311ai_2	A1:I A2:I A3:I B1:I C1: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.spice b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.spice
index 5c6c251..2855b8d 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.spice
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__o311ai_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_670_74# B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=5.18e+11p pd=4.36e+06u as=1.1174e+12p ps=1.042e+07u
-M1001 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0192e+12p pd=8.54e+06u as=1.3328e+12p ps=1.134e+07u
-M1002 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=6.956e+11p pd=6.32e+06u as=0p ps=0u
-M1003 a_28_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0416e+12p pd=8.58e+06u as=0p ps=0u
-M1004 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C1 a_670_74# VNB nshort w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=0p ps=0u
-M1006 a_28_368# A2 a_307_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=7.504e+11p ps=5.82e+06u
-M1007 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B1 a_670_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_307_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_307_368# A2 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A3 a_307_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_670_74# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_28_368# A2 a_307_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_74# B1 a_670_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_670_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A3 a_307_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y C1 a_670_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_670_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_307_368# A2 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_307_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.cdl b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.cdl
index 2072172..ce1f48a 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.cdl
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o311ai_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I C1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPC0 VPWR C1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 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
-MMPC0 VPWR C1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 pndB B1 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
-MMNC0 Y C1 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 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
 .ENDS sky130_fd_sc_ls__o311ai_4
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.netlist.tsv b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.netlist.tsv
index 30f610b..7f70041 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o311ai_4	A1:I A2:I A3:I B1:I C1: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.spice b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.spice
index 95b0682..9932f1d 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.spice
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ls__o311ai_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_841_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.8592e+12p pd=1.452e+07u as=1.8536e+12p ps=1.227e+07u
-M1001 VGND A2 a_459_74# VNB nshort w=740000u l=150000u
-+  ad=2.19225e+12p pd=1.657e+07u as=1.7316e+12p ps=1.652e+07u
-M1002 a_459_74# B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.02765e+12p ps=1.022e+07u
-M1003 Y C1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=0p ps=0u
-M1004 a_459_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A1 a_459_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_841_368# A2 a_1350_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.4e+12p ps=1.146e+07u
-M1007 VPWR A1 a_1350_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.6176e+12p pd=1.99e+07u as=0p ps=0u
-M1008 VGND A3 a_459_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_841_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_459_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_459_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1350_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# B1 a_459_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# B1 a_459_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_459_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1350_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# C1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1350_368# A2 a_841_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y C1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1 a_1350_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A3 a_459_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2 a_459_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_841_368# A2 a_1350_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_459_74# B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y C1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A3 a_841_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_459_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y A3 a_841_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1350_368# A2 a_841_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A1 a_459_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_459_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1350_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_459_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND A2 a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR A1 a_1350_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_841_368# A2 a_1350_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_459_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Y C1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND A3 a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_841_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_1350_368# A2 a_841_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_841_368# A2 a_1350_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR A1 a_1350_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND A2 a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_459_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_74# B1 a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND A1 a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_459_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_459_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_27_74# B1 a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_459_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 Y A3 a_841_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_459_74# B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_1350_368# A2 a_841_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_459_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 a_1350_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_27_74# C1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 Y A3 a_841_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 Y C1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 VGND A1 a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 a_841_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 VGND A3 a_459_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_1.cdl b/cells/o31a/sky130_fd_sc_ls__o31a_1.cdl
index ab61d20..e6671df 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_1.cdl
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o31a_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o31a_1
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_1.netlist.tsv b/cells/o31a/sky130_fd_sc_ls__o31a_1.netlist.tsv
index 41ccfa9..ba80b41 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_1.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o31a_1	A1:I A2:I A3: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o31a/sky130_fd_sc_ls__o31a_1.spice b/cells/o31a/sky130_fd_sc_ls__o31a_1.spice
index e7eea86..fa7989a 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_1.spice
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o31a_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VPWR B1 a_84_48# VPB phighvt w=840000u l=150000u
-+  ad=9.804e+11p pd=5.95e+06u as=3.748e+11p ps=2.78e+06u
-M1001 a_230_94# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=4.48e+11p pd=3.96e+06u as=6.755e+11p ps=4.76e+06u
-M1002 a_84_48# B1 a_230_94# VNB nshort w=640000u l=150000u
-+  ad=2.272e+11p pd=1.99e+06u as=0p ps=0u
-M1003 VGND A2 a_230_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_84_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1005 a_340_368# A2 a_256_368# VPB phighvt w=1e+06u l=150000u
-+  ad=3.6e+11p pd=2.72e+06u as=2.7e+11p ps=2.54e+06u
-M1006 a_84_48# A3 a_340_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_230_94# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_84_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_256_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_230_94# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR A1 a_256_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_256_368# A2 a_340_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_84_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_84_48# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_340_368# A3 a_84_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 VGND A1 a_230_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_230_94# B1 a_84_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND A3 a_230_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 X a_84_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_2.cdl b/cells/o31a/sky130_fd_sc_ls__o31a_2.cdl
index f87cea7..bf1ddd3 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_2.cdl
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o31a_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 y B1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o31a_2
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_2.netlist.tsv b/cells/o31a/sky130_fd_sc_ls__o31a_2.netlist.tsv
index 0a43aa4..9bb9865 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_2.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o31a_2	A1:I A2:I A3: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_2.spice b/cells/o31a/sky130_fd_sc_ls__o31a_2.spice
index 4351c28..4c5ae2c 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_2.spice
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o31a_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_328_74# VNB nshort w=740000u l=150000u
-+  ad=8.843e+11p pd=6.83e+06u as=6.216e+11p ps=4.64e+06u
-M1001 a_430_392# A2 a_346_392# VPB phighvt w=1e+06u l=150000u
-+  ad=4.2e+11p pd=2.84e+06u as=2.7e+11p ps=2.54e+06u
-M1002 a_55_264# B1 a_328_74# VNB nshort w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1003 VPWR B1 a_55_264# VPB phighvt w=1e+06u l=150000u
-+  ad=1.3022e+12p pd=8.95e+06u as=3.9e+11p ps=2.78e+06u
-M1004 a_346_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_55_264# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 VGND a_55_264# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_55_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.976e+11p ps=2.95e+06u
-M1008 X a_55_264# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_328_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_328_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_55_264# A3 a_430_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_55_264# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_328_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_328_74# B1 a_55_264# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_430_392# A3 a_55_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND A1 a_328_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_55_264# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND a_55_264# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 X a_55_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A3 a_328_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR A1 a_346_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 X a_55_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_346_392# A2 a_430_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_4.cdl b/cells/o31a/sky130_fd_sc_ls__o31a_4.cdl
index e8493f5..6ce80f4 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_4.cdl
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o31a_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o31a_4
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_4.netlist.tsv b/cells/o31a/sky130_fd_sc_ls__o31a_4.netlist.tsv
index d5241d4..2d2d298 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_4.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o31a_4	A1:I A2:I A3: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_4.spice b/cells/o31a/sky130_fd_sc_ls__o31a_4.spice
index bfc1bff..ef12a87 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_4.spice
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__o31a_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND a_86_260# X VNB nshort w=740000u l=150000u
-+  ad=1.2225e+12p pd=1.183e+07u as=4.144e+11p ps=4.08e+06u
-M1001 a_699_392# A3 a_86_260# VPB phighvt w=1e+06u l=150000u
-+  ad=9e+11p pd=7.8e+06u as=6e+11p ps=5.2e+06u
-M1002 a_968_392# A2 a_699_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.4e+11p pd=5.28e+06u as=0p ps=0u
-M1003 VPWR a_86_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.7318e+12p pd=1.397e+07u as=6.72e+11p ps=5.68e+06u
-M1004 X a_86_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_968_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_86_260# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_86_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_492_125# B1 a_86_260# VNB nshort w=640000u l=150000u
-+  ad=1.0624e+12p pd=9.72e+06u as=2.112e+11p ps=1.94e+06u
-M1009 X a_86_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_492_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_968_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 a_86_260# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1 a_492_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_492_125# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_86_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_86_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_492_125# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_86_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A3 a_492_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_86_260# A3 a_699_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_492_125# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_86_260# B1 a_492_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_699_392# A2 a_968_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_492_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND A2 a_492_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR A1 a_968_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_968_392# A2 a_699_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_86_260# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_86_260# A3 a_699_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_492_125# B1 a_86_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR a_86_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 X a_86_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_86_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 X a_86_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND A1 a_492_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 VPWR a_86_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_492_125# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_492_125# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_699_392# A2 a_968_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_86_260# B1 a_492_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VGND a_86_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_492_125# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 X a_86_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VPWR B1 a_86_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 a_699_392# A3 a_86_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 X a_86_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_968_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.cdl b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.cdl
index bb13596..f0be2cf 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.cdl
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o31ai_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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_ls__o31ai_1
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.netlist.tsv b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.netlist.tsv
index 98e21ed..a645c78 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o31ai_1	A1:I A2:I A3: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.spice b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.spice
index 5c43205..e945fa7 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.spice
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__o31ai_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_114_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=4.292e+11p pd=4.12e+06u as=9.093e+11p ps=5.45e+06u
-M1001 a_119_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.024e+11p pd=2.78e+06u as=6.608e+11p ps=5.66e+06u
-M1002 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=7.728e+11p ps=3.62e+06u
-M1003 Y B1 a_114_74# VNB nshort w=740000u l=150000u
-+  ad=2.479e+11p pd=2.15e+06u as=0p ps=0u
-M1004 Y A3 a_203_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=3.08e+06u
-M1005 a_114_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_114_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_203_368# A2 a_119_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_114_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_114_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR A1 a_119_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_119_368# A2 a_203_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A1 a_114_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_203_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_114_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.cdl b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.cdl
index 9ae0db9..3a38bbd 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.cdl
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o31ai_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 Y B1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__o31ai_2
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.netlist.tsv b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.netlist.tsv
index 5bcfd1a..a10d338 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o31ai_2	A1:I A2:I A3: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.spice b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.spice
index aa78db6..4ad5bd1 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.spice
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__o31ai_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.0528e+12p ps=8.6e+06u
-M1001 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=1.2616e+12p pd=7.93e+06u as=1.0582e+12p ps=1.026e+07u
-M1002 a_27_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=9.968e+11p ps=8.5e+06u
-M1006 a_28_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.442e+11p pd=2.14e+06u as=0p ps=0u
-M1008 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_297_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1010 a_297_368# A2 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A3 a_297_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_28_368# A2 a_297_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_28_368# A2 a_297_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_297_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_297_368# A2 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 Y A3 a_297_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.cdl b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.cdl
index b4a3614..13d81bb 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.cdl
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__o31ai_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 Y B1 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__o31ai_4
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.netlist.tsv b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.netlist.tsv
index 8d15366..2bc83d0 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__o31ai_4	A1:I A2:I A3: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.spice b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.spice
index 85f37c7..1b04306 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.spice
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ls__o31ai_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.3888e+12p pd=1.144e+07u as=1.8984e+12p ps=1.011e+07u
-M1001 VGND A2 a_27_82# VNB nshort w=740000u l=150000u
-+  ad=2.2892e+12p pd=1.54e+07u as=1.924e+12p ps=1.852e+07u
-M1002 a_27_82# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A1 a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_82# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_82# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_487_368# A2 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4e+12p pd=1.146e+07u as=2.0272e+12p ps=1.482e+07u
-M1007 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_28_368# A2 a_487_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_28_368# A2 a_487_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 a_27_82# VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1011 a_487_368# A2 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A3 a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_28_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A3 a_487_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_82# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A3 a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_28_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_487_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_487_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_82# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_82# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_82# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_82# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_28_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A3 a_487_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND A1 a_27_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_28_368# A2 a_487_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A3 a_487_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_82# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_487_368# A2 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_27_82# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 Y B1 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND A1 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 Y A3 a_487_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_487_368# A2 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND A2 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_28_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_28_368# A2 a_487_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_27_82# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_82# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 Y B1 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_27_82# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND A1 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VGND A3 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_27_82# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 VGND A2 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_27_82# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VPWR A1 a_28_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_487_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_27_82# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 a_487_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 VGND A3 a_27_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_1.cdl b/cells/o32a/sky130_fd_sc_ls__o32a_1.cdl
index 9106694..28cf807 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_1.cdl
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o32a_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o32a_1
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_1.netlist.tsv b/cells/o32a/sky130_fd_sc_ls__o32a_1.netlist.tsv
index 9c719ec..5baf112 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_1.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o32a_1	A1:I A2:I A3: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o32a/sky130_fd_sc_ls__o32a_1.spice b/cells/o32a/sky130_fd_sc_ls__o32a_1.spice
index 19d347a..c9ce6cb 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_1.spice
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o32a_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_251_74# B1 a_83_264# VNB nshort w=640000u l=150000u
-+  ad=6.176e+11p pd=5.77e+06u as=2.848e+11p ps=2.17e+06u
-M1001 VGND A2 a_251_74# VNB nshort w=640000u l=150000u
-+  ad=5.626e+11p pd=4.44e+06u as=0p ps=0u
-M1002 a_83_264# B2 a_251_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_548_368# B2 a_83_264# VPB phighvt w=1e+06u l=150000u
-+  ad=4.45e+11p pd=2.89e+06u as=3.9e+11p ps=2.78e+06u
-M1004 VGND a_83_264# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1005 a_251_74# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_332_368# A2 a_248_368# VPB phighvt w=1e+06u l=150000u
-+  ad=3.9e+11p pd=2.78e+06u as=2.7e+11p ps=2.54e+06u
-M1007 VPWR a_83_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=8.464e+11p pd=5.85e+06u as=3.304e+11p ps=2.83e+06u
-M1008 VPWR B1 a_548_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_251_74# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_248_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_83_264# A3 a_332_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_83_264# B1 a_251_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_83_264# B2 a_548_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VPWR A1 a_248_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND A1 a_251_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_251_74# B2 a_83_264# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_332_368# A3 a_83_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_248_368# A2 a_332_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_251_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VGND A3 a_251_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_548_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_2.cdl b/cells/o32a/sky130_fd_sc_ls__o32a_2.cdl
index b0bc9e5..19871b0 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_2.cdl
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o32a_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 y B1 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
-MMNB1 y B2 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o32a_2
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_2.netlist.tsv b/cells/o32a/sky130_fd_sc_ls__o32a_2.netlist.tsv
index a94ef06..3e31e4c 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_2.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o32a_2	A1:I A2:I A3: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_2.spice b/cells/o32a/sky130_fd_sc_ls__o32a_2.spice
index 9ee12e3..e247457 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_2.spice
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__o32a_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_652_368# B2 a_83_264# VPB phighvt w=1e+06u l=150000u
-+  ad=4.2e+11p pd=2.84e+06u as=4.2e+11p ps=2.84e+06u
-M1001 a_346_368# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=1.2072e+12p ps=8.76e+06u
-M1002 a_83_264# B2 a_349_74# VNB nshort w=740000u l=150000u
-+  ad=6.771e+11p pd=3.31e+06u as=7.289e+11p ps=6.41e+06u
-M1003 a_349_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=9.62e+11p ps=7.04e+06u
-M1004 a_83_264# A3 a_430_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.9e+11p ps=2.78e+06u
-M1005 a_349_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_349_74# B1 a_83_264# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_83_264# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1008 X a_83_264# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1009 VPWR a_83_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_349_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_430_368# A2 a_346_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 a_652_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_83_264# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_349_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_349_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_349_74# B2 a_83_264# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_652_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_83_264# B1 a_349_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND A3 a_349_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_430_368# A3 a_83_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VPWR a_83_264# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR A1 a_346_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VGND a_83_264# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_346_368# A2 a_430_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_83_264# B2 a_652_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_4.cdl b/cells/o32a/sky130_fd_sc_ls__o32a_4.cdl
index 39046e9..240d5b6 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_4.cdl
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o32a_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 sndA1 A2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA2 sndA2 A3 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPB1 sndB1 B2 VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o32a_4
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_4.netlist.tsv b/cells/o32a/sky130_fd_sc_ls__o32a_4.netlist.tsv
index e7a8512..8e576a3 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_4.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o32a_4	A1:I A2:I A3: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_4.spice b/cells/o32a/sky130_fd_sc_ls__o32a_4.spice
index 0ad07ca..427358a 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_4.spice
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__o32a_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR B1 a_534_388# VPB phighvt w=1e+06u l=150000u
-+  ad=1.8398e+12p pd=1.418e+07u as=7.4e+11p ps=5.48e+06u
-M1001 a_564_74# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=1.2032e+12p pd=1.144e+07u as=1.5408e+12p ps=1.279e+07u
-M1002 a_83_256# A3 a_961_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.2e+11p pd=5.24e+06u as=8.9e+11p ps=7.78e+06u
-M1003 a_564_74# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_564_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1234_392# A2 a_961_392# VPB phighvt w=1e+06u l=150000u
-+  ad=7.9e+11p pd=5.58e+06u as=0p ps=0u
-M1006 VGND A2 a_564_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_534_388# B1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_83_256# B1 a_564_74# VNB nshort w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=0p ps=0u
-M1009 VGND A3 a_564_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1234_392# A1 VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_564_74# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_83_256# VGND VNB nshort w=740000u l=150000u
-+  ad=5.069e+11p pd=4.33e+06u as=0p ps=0u
-M1013 VPWR a_83_256# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=8.064e+11p ps=5.92e+06u
-M1014 VPWR A1 a_1234_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_83_256# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_83_256# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_83_256# B2 a_534_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_961_392# A2 a_1234_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_83_256# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_564_74# B2 a_83_256# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_83_256# B2 a_564_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_83_256# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_534_388# B2 a_83_256# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_83_256# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_564_74# B1 a_83_256# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_83_256# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_961_392# A3 a_83_256# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_83_256# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND a_83_256# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_564_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_1234_392# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND A2 a_564_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_564_74# B2 a_83_256# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_534_388# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_83_256# A3 a_961_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_564_74# B1 a_83_256# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_534_388# B2 a_83_256# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_1234_392# A2 a_961_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 X a_83_256# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_564_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 X a_83_256# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VPWR a_83_256# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_83_256# B1 a_564_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 X a_83_256# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND A3 a_564_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 VPWR B1 a_534_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_961_392# A3 a_83_256# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 a_564_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_961_392# A2 a_1234_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 a_83_256# B2 a_534_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 VGND a_83_256# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VPWR A1 a_1234_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 X a_83_256# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_83_256# B2 a_564_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VGND A1 a_564_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.cdl b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.cdl
index 9a0de0a..2c0a8fb 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.cdl
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o32ai_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMPB1 sndB1 B2 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 Y B1 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
-MMNB1 Y B2 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 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_ls__o32ai_1
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.netlist.tsv b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.netlist.tsv
index d91d6fd..6c09413 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o32ai_1	A1:I A2:I A3: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.spice b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.spice
index effbee3..f067bd8 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.spice
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o32ai_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_456_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.056e+11p pd=5.74e+06u as=4.704e+11p ps=3.08e+06u
-M1001 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=5.439e+11p pd=4.43e+06u as=6.771e+11p ps=6.27e+06u
-M1002 a_456_368# A2 a_342_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=3.08e+06u
-M1003 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.329e+11p ps=2.65e+06u
-M1005 a_128_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.024e+11p pd=2.78e+06u as=0p ps=0u
-M1006 a_342_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=5.6e+11p ps=3.24e+06u
-M1007 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B2 a_128_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_456_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR B1 a_128_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_128_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 Y A3 a_342_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_342_368# A2 a_456_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.cdl b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.cdl
index 8743971..d5b1b35 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.cdl
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o32ai_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMPB1 sndB1 B2 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 Y B1 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
-MMNB1 Y B2 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 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
 .ENDS sky130_fd_sc_ls__o32ai_2
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.netlist.tsv b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.netlist.tsv
index 15c0819..3f30f1d 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o32ai_2	A1:I A2:I A3: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.spice b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.spice
index 0d7089f..0a8812c 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.spice
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__o32ai_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_768_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0528e+12p pd=8.6e+06u as=6.776e+11p ps=5.69e+06u
-M1001 a_27_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.968e+11p pd=8.5e+06u as=0p ps=0u
-M1002 Y A3 a_499_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=9.968e+11p ps=8.5e+06u
-M1003 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=1.4208e+12p pd=1.272e+07u as=1.5162e+12p ps=8.64e+06u
-M1004 a_499_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1010 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_768_368# A2 a_499_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_768_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_499_368# A2 a_768_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_499_368# A2 a_768_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_499_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_768_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_768_368# A2 a_499_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 Y A3 a_499_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR A1 a_768_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.cdl b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.cdl
index 13baef3..28ff8f1 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.cdl
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o32ai_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I B1:I B2:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMPB1 sndB1 B2 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
-MMPB1 sndB1 B2 VPB phighvt 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNB0 Y B1 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
-MMNB1 Y B2 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 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
 .ENDS sky130_fd_sc_ls__o32ai_4
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.netlist.tsv b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.netlist.tsv
index 2994466..e5ccaad 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o32ai_4	A1:I A2:I A3: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.spice b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.spice
index 079a104..aba5231 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.spice
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__o32ai_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_861_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.8928e+12p pd=1.458e+07u as=1.344e+12p ps=1.136e+07u
-M1001 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=1.7051e+12p pd=1.361e+07u as=2.9524e+12p ps=2.427e+07u
-M1002 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=9.435e+11p pd=8.47e+06u as=0p ps=0u
-M1003 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.6688e+12p pd=1.418e+07u as=0p ps=0u
-M1005 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A3 a_861_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_1330_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.792e+12p pd=1.44e+07u as=1.4e+12p ps=1.146e+07u
-M1010 VPWR A1 a_1330_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_861_368# A2 a_1330_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1330_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1330_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_27_368# B2 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1330_368# A2 a_861_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1330_368# A2 a_861_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR B1 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_368# B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y B2 a_27_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_861_368# A2 a_1330_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_74# B2 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y A3 a_861_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_27_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_861_368# A3 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1330_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y A3 a_861_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VPWR A1 a_1330_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_861_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_27_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 Y B2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_27_368# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_861_368# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_1330_368# A2 a_861_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_861_368# A2 a_1330_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VPWR B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VPWR B1 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 Y A3 a_861_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_861_368# A2 a_1330_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_1330_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 VPWR A1 a_1330_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 Y B2 a_27_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 a_27_74# B2 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 a_1330_368# A2 a_861_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X39 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_1.cdl b/cells/o41a/sky130_fd_sc_ls__o41a_1.cdl
index 61ad97f..8e9bebc 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_1.cdl
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o41a_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPA3 sndA3 A4 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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_ls__o41a_1
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_1.netlist.tsv b/cells/o41a/sky130_fd_sc_ls__o41a_1.netlist.tsv
index a9a6081..b9715c8 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_1.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o41a_1	A1:I A2:I A3:I A4: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o41a/sky130_fd_sc_ls__o41a_1.spice b/cells/o41a/sky130_fd_sc_ls__o41a_1.spice
index 77319a5..9403555 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_1.spice
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__o41a_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_641_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4016e+12p pd=7.2e+06u as=4.704e+11p ps=3.08e+06u
-M1001 a_527_368# A3 a_443_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.704e+11p pd=3.08e+06u as=3.024e+11p ps=2.78e+06u
-M1002 a_83_270# B1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.0165e+11p pd=3.01e+06u as=0p ps=0u
-M1003 a_641_368# A2 a_527_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A4 a_326_74# VNB nshort w=640000u l=150000u
-+  ad=8.899e+11p pd=6.71e+06u as=6.24e+11p ps=5.79e+06u
-M1005 a_326_74# B1 a_83_270# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1006 VPWR a_83_270# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1007 a_443_368# A4 a_83_270# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_326_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_326_74# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_83_270# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1011 a_326_74# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_326_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR B1 a_83_270# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_443_368# A3 a_527_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_527_368# A2 a_641_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_641_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_326_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 X a_83_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_326_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND A1 a_326_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_83_270# A4 a_443_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_83_270# B1 a_326_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 X a_83_270# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_2.cdl b/cells/o41a/sky130_fd_sc_ls__o41a_2.cdl
index 06f0f44..093888f 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_2.cdl
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o41a_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPA3 sndA3 A4 VPB 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
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 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
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA3 sndA3 A4 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 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
-MMIPX X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNA3 pndA A4 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
-MMNB0 y B1 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
-MMINX X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o41a_2
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_2.netlist.tsv b/cells/o41a/sky130_fd_sc_ls__o41a_2.netlist.tsv
index 85ec069..01c8e4c 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_2.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o41a_2	A1:I A2:I A3:I A4: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_2.spice b/cells/o41a/sky130_fd_sc_ls__o41a_2.spice
index 090f11f..52828cc 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_2.spice
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__o41a_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 X a_428_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=1.7526e+12p ps=1.002e+07u
-M1001 a_200_368# A2 a_116_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.704e+11p pd=3.08e+06u as=3.024e+11p ps=2.78e+06u
-M1002 a_27_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=6.364e+11p pd=6.16e+06u as=1.2691e+12p ps=9.35e+06u
-M1003 X a_428_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 VPWR a_428_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_428_368# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_116_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_428_368# B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=2.627e+11p pd=2.19e+06u as=0p ps=0u
-M1009 a_428_368# A4 a_314_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.554e+11p pd=3.08e+06u as=4.704e+11p ps=3.08e+06u
-M1010 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 a_428_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_314_368# A3 a_200_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_428_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X a_428_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR A1 a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_116_368# A2 a_200_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR a_428_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND A4 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_200_368# A3 a_314_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_27_74# B1 a_428_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_428_368# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_314_368# A4 a_428_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 X a_428_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_4.cdl b/cells/o41a/sky130_fd_sc_ls__o41a_4.cdl
index 82df91e..f561f30 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_4.cdl
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__o41a_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPA3 sndA3 A4 VPB 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
+MMPB0 VPWR B1 VPB pfet_01v8_hvt m=2 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
+MMIPX X y VPB 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y 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
 .ENDS sky130_fd_sc_ls__o41a_4
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_4.netlist.tsv b/cells/o41a/sky130_fd_sc_ls__o41a_4.netlist.tsv
index fdb81ac..20b95ef 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_4.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__o41a_4	A1:I A2:I A3:I A4: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_4.spice b/cells/o41a/sky130_fd_sc_ls__o41a_4.spice
index 90ed9c3..e560e0e 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_4.spice
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__o41a_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 X a_110_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.6953e+12p ps=1.387e+07u
-M1001 a_523_124# A4 VGND VNB nshort w=640000u l=150000u
-+  ad=1.1456e+12p pd=1.126e+07u as=1.69995e+12p ps=1.463e+07u
-M1002 a_523_124# A3 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_523_124# B1 a_110_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1004 VPWR a_110_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_523_124# A2 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_110_48# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1007 a_523_124# A1 VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1213_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.28e+11p pd=5.78e+06u as=0p ps=0u
-M1009 VGND A1 a_523_124# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_110_48# B1 VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.992e+11p pd=5.14e+06u as=0p ps=0u
-M1011 a_110_48# B1 a_523_124# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_110_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A3 a_523_124# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_110_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_762_368# A3 a_851_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.0528e+12p pd=8.6e+06u as=6.72e+11p ps=5.68e+06u
-M1016 VGND a_110_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_762_368# A2 a_1213_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B1 a_110_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_851_368# A3 a_762_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A2 a_523_124# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_110_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_851_368# A4 a_110_48# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1213_368# A2 a_762_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_110_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_110_48# A4 a_851_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A4 a_523_124# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A1 a_1213_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_110_48# A4 a_851_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VPWR A1 a_1213_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 X a_110_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_110_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A2 a_523_124# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VGND A1 a_523_124# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_110_48# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_1213_368# A2 a_762_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_110_48# B1 a_523_124# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_523_124# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_762_368# A3 a_851_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND a_110_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VGND A4 a_523_124# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_523_124# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_762_368# A2 a_1213_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_523_124# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 X a_110_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 VGND A3 a_523_124# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_523_124# B1 a_110_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 X a_110_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_523_124# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VPWR B1 a_110_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 VGND a_110_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_851_368# A4 a_110_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 X a_110_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_1213_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_851_368# A3 a_762_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 VPWR a_110_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.cdl b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.cdl
index 2dee70c..ea7dc45 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.cdl
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o41ai_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPA3 sndA3 A4 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPA3 sndA3 A4 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNA3 pndA A4 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
-MMNB0 Y B1 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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_ls__o41ai_1
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.netlist.tsv b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.netlist.tsv
index 47c25bb..8d84745 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o41ai_1	A1:I A2:I A3:I A4: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	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.spice b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.spice
index 48acc78..28b832d 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.spice
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__o41ai_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_157_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=7.104e+11p pd=6.36e+06u as=6.327e+11p ps=4.67e+06u
-M1001 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.92e+11p pd=2.94e+06u as=9.072e+11p ps=6.1e+06u
-M1002 a_157_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_260_368# A4 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.808e+11p pd=2.92e+06u as=0p ps=0u
-M1004 VPWR A1 a_472_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=3.08e+06u
-M1005 a_472_368# A2 a_358_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=3.08e+06u
-M1006 VGND A2 a_157_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A4 a_157_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_157_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_358_368# A3 a_260_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_157_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 Y B1 a_157_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_472_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_157_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 VGND A1 a_157_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_260_368# A3 a_358_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Y A4 a_260_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_157_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_358_368# A2 a_472_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.cdl b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.cdl
index f9d5256..a4920df 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.cdl
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o41ai_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPA3 sndA3 A4 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPA3 sndA3 A4 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNA3 pndA A4 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
-MMNB0 Y B1 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__o41ai_2
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.netlist.tsv b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.netlist.tsv
index 39f26dc..13a545e 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o41ai_2	A1:I A2:I A3:I A4: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	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.spice b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.spice
index 7bcdaa9..2b4d558 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.spice
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__o41ai_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_132_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=1.4245e+12p pd=1.273e+07u as=1.0397e+12p ps=8.73e+06u
-M1001 VGND A4 a_132_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_607_368# A2 a_807_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=9.744e+11p ps=8.46e+06u
-M1003 a_132_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 VGND A3 a_132_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_132_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_607_368# A3 a_314_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=1.1144e+12p ps=8.71e+06u
-M1007 a_132_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_132_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_807_368# A2 a_607_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_807_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.688e+11p pd=8.45e+06u as=0p ps=0u
-M1011 Y A4 a_314_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1012 a_314_368# A3 a_607_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A1 a_132_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_807_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_314_368# A4 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A2 a_132_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 a_132_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_132_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_132_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_132_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_807_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_607_368# A3 a_314_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VGND A1 a_132_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_132_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y B1 a_132_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 Y A4 a_314_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND A3 a_132_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_807_368# A2 a_607_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VPWR A1 a_807_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_132_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VGND A4 a_132_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_132_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_314_368# A3 a_607_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_314_368# A4 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 a_607_368# A2 a_807_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.cdl b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.cdl
index f7e0c4c..37bf272 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.cdl
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__o41ai_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
 *.PININFO A1:I A2:I A3:I A4:I B1:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMPA0 VPWR A1 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB 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
+MMPA1 sndA1 A2 VPB 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
+MMPA2 sndA2 A3 VPB 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
+MMPA3 sndA3 A4 VPB 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
+MMPB0 VPWR B1 VPB 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
+MMNA0 pndA A1 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
-MMPA1 sndA1 A2 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 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
-MMPA2 sndA2 A3 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 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
-MMPA3 sndA3 A4 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 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
-MMPB0 VPWR B1 VPB 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
-MMNA0 pndA A1 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
-MMNA1 pndA A2 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
-MMNA2 pndA A3 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
-MMNA3 pndA A4 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
-MMNB0 Y B1 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 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
 .ENDS sky130_fd_sc_ls__o41ai_4
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.netlist.tsv b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.netlist.tsv
index 614e8d3..05ed3da 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__o41ai_4	A1:I A2:I A3:I A4: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	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.spice b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.spice
index 157e6cd..c854903 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.spice
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_ls__o41ai_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_339_368# A4 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.6688e+12p pd=1.418e+07u as=1.12e+12p ps=8.72e+06u
-M1001 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=2.3976e+12p pd=2.276e+07u as=2.1756e+12p ps=1.772e+07u
-M1002 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_788_368# A3 a_339_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.456e+12p pd=1.156e+07u as=0p ps=0u
-M1004 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_339_368# A3 a_788_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_1191_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.4448e+12p pd=1.154e+07u as=1.6688e+12p ps=1.418e+07u
-M1007 Y A4 a_339_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A4 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_788_368# A2 a_1191_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1011 a_1191_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_74# A2 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_339_368# A4 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1191_368# A2 a_788_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B1 Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_74# A4 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A1 a_1191_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_788_368# A3 a_339_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_788_368# A2 a_1191_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A2 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A4 a_339_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1191_368# A1 VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y B1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_27_74# B1 Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_27_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A1 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_74# A1 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_339_368# A3 a_788_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_27_74# A3 VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1191_368# A2 a_788_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND A4 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A3 a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1191_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_1191_368# A2 a_788_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_339_368# A3 a_788_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_1191_368# A2 a_788_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 Y B1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VPWR A1 a_1191_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 Y A4 a_339_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND A4 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_27_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 Y A4 a_339_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_788_368# A3 a_339_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_788_368# A2 a_1191_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X19 VGND A2 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 VGND A4 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VGND A3 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_788_368# A2 a_1191_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_1191_368# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_339_368# A3 a_788_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_788_368# A3 a_339_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_339_368# A4 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X30 a_27_74# B1 Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_27_74# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_27_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 a_27_74# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VGND A1 a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 a_339_368# A4 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 VPWR A1 a_1191_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 a_27_74# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_ls__or2_1.cdl b/cells/or2/sky130_fd_sc_ls__or2_1.cdl
index 96ed835..6107332 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_1.cdl
+++ b/cells/or2/sky130_fd_sc_ls__or2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB 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
+MMP1 sndPA B VPB 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
+MMIP2 X y VPB 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
-MMP1 sndPA B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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_ls__or2_1
diff --git a/cells/or2/sky130_fd_sc_ls__or2_1.netlist.tsv b/cells/or2/sky130_fd_sc_ls__or2_1.netlist.tsv
index f5df232..8663f4f 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_1.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_ls__or2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__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	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	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/or2/sky130_fd_sc_ls__or2_1.spice b/cells/or2/sky130_fd_sc_ls__or2_1.spice
index 8fd6cb5..7f38fe5 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_1.spice
+++ b/cells/or2/sky130_fd_sc_ls__or2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_ls__or2_1 A B VGND VNB VPB VPWR X
-M1000 a_152_368# B a_63_368# VPB phighvt w=840000u l=150000u
-+  ad=2.268e+11p pd=2.22e+06u as=2.478e+11p ps=2.27e+06u
-M1001 X a_63_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=5.7345e+11p ps=4.42e+06u
-M1002 X a_63_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=6.692e+11p ps=3.52e+06u
-M1003 VGND A a_63_368# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=2.6125e+11p ps=2.05e+06u
-M1004 a_63_368# B VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_152_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_63_368# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 VPWR a_63_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_152_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_63_368# B a_152_368# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VGND a_63_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND B a_63_368# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_ls__or2_2.cdl b/cells/or2/sky130_fd_sc_ls__or2_2.cdl
index f1cd2ad..c57a09a 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_2.cdl
+++ b/cells/or2/sky130_fd_sc_ls__or2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__or2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
 .ENDS sky130_fd_sc_ls__or2_2
diff --git a/cells/or2/sky130_fd_sc_ls__or2_2.netlist.tsv b/cells/or2/sky130_fd_sc_ls__or2_2.netlist.tsv
index 8b5b12d..b42f37e 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_2.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_ls__or2_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__or2_2	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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_ls__or2_2.spice b/cells/or2/sky130_fd_sc_ls__or2_2.spice
index df47ab1..8a422af 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_2.spice
+++ b/cells/or2/sky130_fd_sc_ls__or2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__or2_2 A B VGND VNB VPB VPWR X
-M1000 VPWR A a_114_368# VPB phighvt w=1e+06u l=150000u
-+  ad=7.558e+11p pd=5.85e+06u as=2.4e+11p ps=2.48e+06u
-M1001 VPWR a_27_368# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.584e+11p ps=2.88e+06u
-M1002 VGND a_27_368# X VNB nshort w=740000u l=150000u
-+  ad=6.823e+11p pd=6.18e+06u as=2.072e+11p ps=2.04e+06u
-M1003 X a_27_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_368# B VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1005 VGND A a_27_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_114_368# B a_27_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
+X0 X a_27_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_27_368# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_27_368# B a_114_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 X a_27_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND B a_27_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR a_27_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_114_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VGND a_27_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_ls__or2_4.cdl b/cells/or2/sky130_fd_sc_ls__or2_4.cdl
index 5e6beb8..8cc13e1 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_4.cdl
+++ b/cells/or2/sky130_fd_sc_ls__or2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_ls__or2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=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
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMIP2 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B 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
-MMN0 y 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
-MMN1 y B 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
-MMIN2 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
 .ENDS sky130_fd_sc_ls__or2_4
diff --git a/cells/or2/sky130_fd_sc_ls__or2_4.netlist.tsv b/cells/or2/sky130_fd_sc_ls__or2_4.netlist.tsv
index 954849e..066e8ed 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_4.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_ls__or2_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_ls__or2_4	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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_ls__or2_4.spice b/cells/or2/sky130_fd_sc_ls__or2_4.spice
index f1dc02c..543f1b2 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_4.spice
+++ b/cells/or2/sky130_fd_sc_ls__or2_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__or2_4 A B VGND VNB VPB VPWR X
-M1000 a_493_388# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.5e+11p pd=5.3e+06u as=1.4068e+12p ps=1.132e+07u
-M1001 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1002 VGND B a_83_260# VNB nshort w=740000u l=150000u
-+  ad=1.6058e+12p pd=1.026e+07u as=2.479e+11p ps=2.15e+06u
-M1003 a_83_260# B a_493_388# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1004 a_83_260# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=4.773e+11p pd=4.25e+06u as=0p ps=0u
-M1006 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_493_388# B a_83_260# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_83_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_493_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_83_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_83_260# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_83_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_493_388# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 X a_83_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_493_388# B a_83_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VPWR a_83_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_83_260# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 X a_83_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_83_260# B a_493_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 VGND a_83_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR A a_493_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 VGND A a_83_260# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_1.cdl b/cells/or2b/sky130_fd_sc_ls__or2b_1.cdl
index 48c787a..9ad709c 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_1.cdl
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__or2b_1 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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_ls__or2b_1
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_1.netlist.tsv b/cells/or2b/sky130_fd_sc_ls__or2b_1.netlist.tsv
index 362e252..20b904e 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_1.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__or2b_1	A:I B_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	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/or2b/sky130_fd_sc_ls__or2b_1.spice b/cells/or2b/sky130_fd_sc_ls__or2b_1.spice
index fc16ee1..345f00a 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_1.spice
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__or2b_1 A B_N VGND VNB VPB VPWR X
-M1000 a_264_368# a_27_112# VGND VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=7.357e+11p ps=5.01e+06u
-M1001 VGND A a_264_368# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A a_353_368# VPB phighvt w=1e+06u l=150000u
-+  ad=7.662e+11p pd=5.48e+06u as=2.7e+11p ps=2.54e+06u
-M1003 VGND B_N a_27_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=3.685e+11p ps=2.44e+06u
-M1004 a_353_368# a_27_112# a_264_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1005 VPWR B_N a_27_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1006 X a_264_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1007 X a_264_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 a_353_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VGND a_27_112# a_264_368# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 a_264_368# a_27_112# a_353_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VGND a_264_368# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_112# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 a_264_368# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 a_27_112# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 VPWR a_264_368# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_2.cdl b/cells/or2b/sky130_fd_sc_ls__or2b_2.cdl
index a6b543d..a05f33c 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_2.cdl
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__or2b_2 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
 .ENDS sky130_fd_sc_ls__or2b_2
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_2.netlist.tsv b/cells/or2b/sky130_fd_sc_ls__or2b_2.netlist.tsv
index 7af521a..1cc86ea 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_2.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__or2b_2	A:I B_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_2.spice b/cells/or2b/sky130_fd_sc_ls__or2b_2.spice
index 3164ab7..b97c85d 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_2.spice
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__or2b_2 A B_N VGND VNB VPB VPWR X
-M1000 VPWR a_187_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=8.614e+11p pd=6.09e+06u as=5.768e+11p ps=3.27e+06u
-M1001 VGND B_N a_27_368# VNB nshort w=550000u l=150000u
-+  ad=9.5555e+11p pd=7.08e+06u as=1.5675e+11p ps=1.67e+06u
-M1002 a_187_48# A VGND VNB nshort w=640000u l=150000u
-+  ad=2.208e+11p pd=1.97e+06u as=0p ps=0u
-M1003 X a_187_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 VGND a_187_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_27_368# a_187_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B_N a_27_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1007 a_187_48# a_27_368# a_470_368# VPB phighvt w=1e+06u l=150000u
-+  ad=4.15e+11p pd=2.83e+06u as=2.7e+11p ps=2.54e+06u
-M1008 X a_187_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_470_368# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_187_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 X a_187_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_27_368# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 X a_187_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_27_368# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 a_470_368# a_27_368# a_187_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_187_48# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR A a_470_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND A a_187_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VGND a_187_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_4.cdl b/cells/or2b/sky130_fd_sc_ls__or2b_4.cdl
index fb35528..e9d77dc 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_4.cdl
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__or2b_4 A B_N VGND VNB VPB VPWR X
 *.PININFO A:I B_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=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
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y 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
 .ENDS sky130_fd_sc_ls__or2b_4
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_4.netlist.tsv b/cells/or2b/sky130_fd_sc_ls__or2b_4.netlist.tsv
index f108555..65cb409 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_4.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__or2b_4	A:I B_N: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	B	B_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_4.spice b/cells/or2b/sky130_fd_sc_ls__or2b_4.spice
index 10b5b95..2ed3f45 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_4.spice
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_ls__or2b_4 A B_N VGND VNB VPB VPWR X
-M1000 X a_81_296# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.6394e+12p ps=1.379e+07u
-M1001 a_81_296# a_676_48# a_489_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=8.8e+11p ps=7.76e+06u
-M1002 a_489_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_81_296# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_81_296# A VGND VNB nshort w=640000u l=150000u
-+  ad=4.672e+11p pd=4.02e+06u as=1.1509e+12p ps=1.032e+07u
-M1005 a_489_392# a_676_48# a_81_296# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_676_48# B_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 VPWR A a_489_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_81_296# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.329e+11p ps=4.13e+06u
-M1009 a_81_296# a_676_48# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_81_296# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_81_296# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_81_296# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_81_296# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_81_296# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_81_296# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_676_48# B_N VGND VNB nshort w=640000u l=150000u
-+  ad=6.272e+11p pd=3.24e+06u as=0p ps=0u
-M1017 VGND a_676_48# a_81_296# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_81_296# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VPWR a_81_296# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 X a_81_296# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR A a_489_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VPWR a_81_296# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 X a_81_296# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_489_392# a_676_48# a_81_296# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VGND B_N a_676_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 X a_81_296# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_489_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 X a_81_296# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VPWR B_N a_676_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VGND a_676_48# a_81_296# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VGND a_81_296# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND A a_81_296# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_81_296# a_676_48# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VGND a_81_296# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_81_296# a_676_48# a_489_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_ls__or3_1.cdl b/cells/or3/sky130_fd_sc_ls__or3_1.cdl
index 680cbd1..d5e38c8 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_1.cdl
+++ b/cells/or3/sky130_fd_sc_ls__or3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__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 phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y 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_ls__or3_1
diff --git a/cells/or3/sky130_fd_sc_ls__or3_1.netlist.tsv b/cells/or3/sky130_fd_sc_ls__or3_1.netlist.tsv
index 6133e07..128e129 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_1.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_ls__or3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	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/or3/sky130_fd_sc_ls__or3_1.spice b/cells/or3/sky130_fd_sc_ls__or3_1.spice
index f127632..58adcf9 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_1.spice
+++ b/cells/or3/sky130_fd_sc_ls__or3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_ls__or3_1 A B C VGND VNB VPB VPWR X
-M1000 a_200_368# B a_116_368# VPB phighvt w=1e+06u l=150000u
-+  ad=4.2e+11p pd=2.84e+06u as=2.7e+11p ps=2.54e+06u
-M1001 VGND A a_27_74# VNB nshort w=550000u l=150000u
-+  ad=4.71e+11p pd=4.12e+06u as=5.225e+11p ps=4.1e+06u
-M1002 a_27_74# B VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 a_116_368# C a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1005 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=7.618e+11p ps=3.7e+06u
-M1006 VGND C a_27_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_200_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_27_74# C a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_116_368# B a_200_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_200_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_27_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_ls__or3_2.cdl b/cells/or3/sky130_fd_sc_ls__or3_2.cdl
index d3432e3..6723bae 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_2.cdl
+++ b/cells/or3/sky130_fd_sc_ls__or3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__or3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y 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
 .ENDS sky130_fd_sc_ls__or3_2
diff --git a/cells/or3/sky130_fd_sc_ls__or3_2.netlist.tsv b/cells/or3/sky130_fd_sc_ls__or3_2.netlist.tsv
index 77a541e..1db7b09 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_2.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_ls__or3_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__or3_2	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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_ls__or3_2.spice b/cells/or3/sky130_fd_sc_ls__or3_2.spice
index a8e9222..6053ff5 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_2.spice
+++ b/cells/or3/sky130_fd_sc_ls__or3_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__or3_2 A B C VGND VNB VPB VPWR X
-M1000 VPWR a_27_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=8.782e+11p pd=6.09e+06u as=3.36e+11p ps=2.84e+06u
-M1001 VPWR A a_234_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=4.2e+11p ps=2.84e+06u
-M1002 a_234_392# B a_150_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1003 a_150_392# C a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1004 VGND A a_27_74# VNB nshort w=640000u l=150000u
-+  ad=9.725e+11p pd=7.09e+06u as=4.064e+11p ps=3.83e+06u
-M1005 X a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 a_27_74# B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_150_392# B a_234_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_27_74# C a_150_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_27_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_234_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_ls__or3_4.cdl b/cells/or3/sky130_fd_sc_ls__or3_4.cdl
index be7203a..741a340 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_4.cdl
+++ b/cells/or3/sky130_fd_sc_ls__or3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_ls__or3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B 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
-MMIP3 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C 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
-MMN0 y 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
-MMN1 y B 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
-MMN2 y C 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
-MMIN3 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y 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
 .ENDS sky130_fd_sc_ls__or3_4
diff --git a/cells/or3/sky130_fd_sc_ls__or3_4.netlist.tsv b/cells/or3/sky130_fd_sc_ls__or3_4.netlist.tsv
index 4fabf8d..79b8313 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_4.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_ls__or3_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_ls__or3_4	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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_ls__or3_4.spice b/cells/or3/sky130_fd_sc_ls__or3_4.spice
index ddfe140..60f014a 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_4.spice
+++ b/cells/or3/sky130_fd_sc_ls__or3_4.spice
@@ -16,38 +16,21 @@
 
 
 .subckt sky130_fd_sc_ls__or3_4 A B C VGND VNB VPB VPWR X
-M1000 a_116_388# B a_206_388# VPB phighvt w=1e+06u l=150000u
-+  ad=6.5e+11p pd=5.3e+06u as=6.85e+11p ps=5.37e+06u
-M1001 X a_302_388# VGND VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=9.879e+11p ps=8.59e+06u
-M1002 a_116_388# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=1.3788e+12p ps=1.127e+07u
-M1003 a_206_388# B a_116_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_302_388# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.625e+11p ps=4.21e+06u
-M1005 X a_302_388# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1006 VPWR A a_116_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_302_388# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C a_302_388# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_302_388# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_302_388# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_302_388# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_302_388# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_302_388# C a_206_388# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1014 VPWR a_302_388# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_302_388# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_206_388# C a_302_388# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_302_388# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 X a_302_388# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_116_388# B a_206_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_116_388# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_206_388# C a_302_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_302_388# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 X a_302_388# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 VGND a_302_388# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VGND B a_302_388# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_302_388# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 X a_302_388# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR a_302_388# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_302_388# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_302_388# C a_206_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 VPWR a_302_388# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 VPWR A a_116_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_206_388# B a_116_388# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_1.cdl b/cells/or3b/sky130_fd_sc_ls__or3b_1.cdl
index 3fdc1a0..f90f93d 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_1.cdl
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__or3b_1 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y 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_ls__or3b_1
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_1.netlist.tsv b/cells/or3b/sky130_fd_sc_ls__or3b_1.netlist.tsv
index e24b9a9..ca409c6 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_1.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__or3b_1	A:I B:I C_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	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/or3b/sky130_fd_sc_ls__or3b_1.spice b/cells/or3b/sky130_fd_sc_ls__or3b_1.spice
index fd12cc0..32ad354 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_1.spice
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__or3b_1 A B C_N VGND VNB VPB VPWR X
-M1000 X a_239_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=7.578e+11p ps=5.46e+06u
-M1001 VGND A a_239_74# VNB nshort w=550000u l=150000u
-+  ad=8.0375e+11p pd=6.43e+06u as=3.3e+11p ps=3.4e+06u
-M1002 VGND a_124_424# a_239_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_452_391# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1004 X a_239_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 a_452_391# B a_368_391# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1006 a_124_424# C_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.595e+11p pd=1.68e+06u as=0p ps=0u
-M1007 a_124_424# C_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.562e+11p pd=2.29e+06u as=0p ps=0u
-M1008 a_368_391# a_124_424# a_239_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1009 a_239_74# B VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B a_239_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 a_239_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 VPWR C_N a_124_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_239_74# a_124_424# a_368_391# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_452_391# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_239_74# a_124_424# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 VGND C_N a_124_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 VGND a_239_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_368_391# B a_452_391# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VPWR a_239_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_2.cdl b/cells/or3b/sky130_fd_sc_ls__or3b_2.cdl
index 44dbb77..6e31be7 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_2.cdl
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__or3b_2 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y 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
 .ENDS sky130_fd_sc_ls__or3b_2
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_2.netlist.tsv b/cells/or3b/sky130_fd_sc_ls__or3b_2.netlist.tsv
index dd7266d..6aab0e6 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_2.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__or3b_2	A:I B:I C_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_2.spice b/cells/or3b/sky130_fd_sc_ls__or3b_2.spice
index fe1986e..4b8ebe1 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_2.spice
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__or3b_2 A B C_N VGND VNB VPB VPWR X
-M1000 VPWR a_190_260# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.04315e+12p pd=6.42e+06u as=3.36e+11p ps=2.84e+06u
-M1001 a_458_368# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1002 a_190_260# a_27_368# a_542_368# VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=3.9e+11p ps=2.78e+06u
-M1003 X a_190_260# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=9.1395e+11p ps=6.95e+06u
-M1004 VGND C_N a_27_368# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1005 VGND B a_190_260# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.064e+11p ps=3.83e+06u
-M1006 a_190_260# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR C_N a_27_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1008 VGND a_190_260# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_190_260# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_542_368# B a_458_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_190_260# a_27_368# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_190_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND a_27_368# a_190_260# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VGND a_190_260# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_190_260# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_27_368# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 X a_190_260# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A a_458_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_542_368# a_27_368# a_190_260# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_27_368# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_190_260# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_458_368# B a_542_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 X a_190_260# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_4.cdl b/cells/or3b/sky130_fd_sc_ls__or3b_4.cdl
index 31d5a0d..487b950 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_4.cdl
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__or3b_4 A B C_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B 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
-MMIP2 C C_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C 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
-MMIP3 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y B 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
-MMN2 y C 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
-MMIN2 C C_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y 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
 .ENDS sky130_fd_sc_ls__or3b_4
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_4.netlist.tsv b/cells/or3b/sky130_fd_sc_ls__or3b_4.netlist.tsv
index 2ddd43c..e8adbc6 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_4.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__or3b_4	A:I B:I C_N: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_4.spice b/cells/or3b/sky130_fd_sc_ls__or3b_4.spice
index 9dfd1cd..c0b592b 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_4.spice
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_4.spice
@@ -16,42 +16,23 @@
 
 
 .subckt sky130_fd_sc_ls__or3b_4 A B C_N VGND VNB VPB VPWR X
-M1000 X a_409_392# VGND VNB nshort w=740000u l=150000u
-+  ad=4.329e+11p pd=4.13e+06u as=1.64125e+12p ps=1.215e+07u
-M1001 X a_409_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=1.407e+12p ps=1.133e+07u
-M1002 VPWR a_409_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_409_392# B VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1004 VGND a_409_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_27_392# a_409_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_307_392# a_27_392# a_409_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.6e+11p pd=5.32e+06u as=3.25e+11p ps=2.65e+06u
-M1007 a_217_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.6e+11p pd=5.32e+06u as=0p ps=0u
-M1008 X a_409_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_409_392# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C_N a_27_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1011 a_217_392# B a_307_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_217_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR C_N a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1014 VGND a_409_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_307_392# B a_217_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_409_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_409_392# a_27_392# a_307_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_409_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_307_392# B a_217_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_409_392# a_27_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_409_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_217_392# B a_307_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_217_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND a_409_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR a_409_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VPWR a_409_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 X a_409_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_409_392# a_27_392# a_307_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_27_392# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_27_392# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_307_392# a_27_392# a_409_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 X a_409_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR A a_217_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VGND B a_409_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_409_392# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 X a_409_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VGND a_409_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_ls__or4_1.cdl b/cells/or4/sky130_fd_sc_ls__or4_1.cdl
index 590d655..7eb258b 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_1.cdl
+++ b/cells/or4/sky130_fd_sc_ls__or4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__or4_1 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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_ls__or4_1
diff --git a/cells/or4/sky130_fd_sc_ls__or4_1.netlist.tsv b/cells/or4/sky130_fd_sc_ls__or4_1.netlist.tsv
index 22be619..d9b50ac 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_1.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_ls__or4_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__or4_1	A:I B:I C:I D: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	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/or4/sky130_fd_sc_ls__or4_1.spice b/cells/or4/sky130_fd_sc_ls__or4_1.spice
index 134adad..12efc22 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_1.spice
+++ b/cells/or4/sky130_fd_sc_ls__or4_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__or4_1 A B C D VGND VNB VPB VPWR X
-M1000 a_133_392# D a_44_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.95e+11p ps=2.59e+06u
-M1001 VGND C a_44_392# VNB nshort w=550000u l=150000u
-+  ad=7.822e+11p pd=6.34e+06u as=3.96e+11p ps=3.64e+06u
-M1002 a_44_392# D VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A a_44_392# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_44_392# B VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_331_392# VPB phighvt w=1e+06u l=150000u
-+  ad=5.718e+11p pd=3.32e+06u as=4.2e+11p ps=2.84e+06u
-M1006 X a_44_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1007 a_217_392# C a_133_392# VPB phighvt w=1e+06u l=150000u
-+  ad=4.2e+11p pd=2.84e+06u as=0p ps=0u
-M1008 X a_44_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1009 a_331_392# B a_217_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_44_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 a_44_392# C VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 a_44_392# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 a_44_392# D a_133_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_217_392# B a_331_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_133_392# C a_217_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 VGND D a_44_392# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 VGND B a_44_392# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 VGND a_44_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_331_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_ls__or4_2.cdl b/cells/or4/sky130_fd_sc_ls__or4_2.cdl
index 75f1758..b0f7fd3 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_2.cdl
+++ b/cells/or4/sky130_fd_sc_ls__or4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__or4_2 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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
 .ENDS sky130_fd_sc_ls__or4_2
diff --git a/cells/or4/sky130_fd_sc_ls__or4_2.netlist.tsv b/cells/or4/sky130_fd_sc_ls__or4_2.netlist.tsv
index 237fa38..b365f42 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_2.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_ls__or4_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__or4_2	A:I B:I C:I D: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_ls__or4_2.spice b/cells/or4/sky130_fd_sc_ls__or4_2.spice
index 784c104..f6c97aa 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_2.spice
+++ b/cells/or4/sky130_fd_sc_ls__or4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__or4_2 A B C D VGND VNB VPB VPWR X
-M1000 a_174_392# D a_85_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.95e+11p ps=2.59e+06u
-M1001 a_85_392# B VGND VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=1.24458e+12p ps=9.28e+06u
-M1002 X a_85_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 VPWR A a_342_392# VPB phighvt w=1e+06u l=150000u
-+  ad=8.628e+11p pd=6.04e+06u as=4.3e+11p ps=2.86e+06u
-M1004 a_85_392# D VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_85_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1006 VGND A a_85_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C a_85_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_85_392# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_342_392# B a_258_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1010 VPWR a_85_392# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_258_392# C a_174_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B a_85_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_85_392# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_85_392# C VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VPWR a_85_392# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_174_392# C a_258_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND D a_85_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_85_392# D a_174_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_258_392# B a_342_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND a_85_392# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 X a_85_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 X a_85_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_342_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_ls__or4_4.cdl b/cells/or4/sky130_fd_sc_ls__or4_4.cdl
index 3a602ca..064fcd8 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_4.cdl
+++ b/cells/or4/sky130_fd_sc_ls__or4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__or4_4 A B C D VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B 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
-MMP3 sndPC D VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C 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
-MMIP4 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D 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
-MMN0 y 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
-MMN1 y B 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
-MMN2 y C 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
-MMN3 y D 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
-MMIN4 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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
 .ENDS sky130_fd_sc_ls__or4_4
diff --git a/cells/or4/sky130_fd_sc_ls__or4_4.netlist.tsv b/cells/or4/sky130_fd_sc_ls__or4_4.netlist.tsv
index 4673146..0cdde9f 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_4.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_ls__or4_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__or4_4	A:I B:I C:I D: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_ls__or4_4.spice b/cells/or4/sky130_fd_sc_ls__or4_4.spice
index cb7a786..4687f0c 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_4.spice
+++ b/cells/or4/sky130_fd_sc_ls__or4_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_ls__or4_4 A B C D VGND VNB VPB VPWR X
-M1000 VGND a_83_264# X VNB nshort w=740000u l=150000u
-+  ad=2.2402e+12p pd=1.413e+07u as=6.549e+11p ps=4.73e+06u
-M1001 VPWR a_83_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.2968e+12p pd=1.11e+07u as=6.72e+11p ps=5.68e+06u
-M1002 a_962_392# D a_83_264# VPB phighvt w=1e+06u l=150000u
-+  ad=6.5e+11p pd=5.3e+06u as=3e+11p ps=2.6e+06u
-M1003 a_83_264# B VGND VNB nshort w=740000u l=150000u
-+  ad=4.662e+11p pd=4.22e+06u as=0p ps=0u
-M1004 X a_83_264# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND D a_83_264# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_499_392# C a_962_392# VPB phighvt w=1e+06u l=150000u
-+  ad=9.9e+11p pd=7.98e+06u as=0p ps=0u
-M1007 X a_83_264# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_83_264# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_588_392# B a_499_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.2e+11p pd=5.24e+06u as=0p ps=0u
-M1010 VGND A a_83_264# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_83_264# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_83_264# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_83_264# C VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_499_392# B a_588_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_588_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_83_264# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_962_392# C a_499_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_588_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_83_264# D a_962_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_83_264# D VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR a_83_264# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_588_392# B a_499_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VPWR A a_588_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_962_392# C a_499_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_499_392# B a_588_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_962_392# D a_83_264# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VPWR a_83_264# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND a_83_264# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_83_264# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_499_392# C a_962_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VGND B a_83_264# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_83_264# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 X a_83_264# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 X a_83_264# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND C a_83_264# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_588_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_83_264# D a_962_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_1.cdl b/cells/or4b/sky130_fd_sc_ls__or4b_1.cdl
index 0da2767..1b225f8 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_1.cdl
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__or4b_1 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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_ls__or4b_1
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_1.netlist.tsv b/cells/or4b/sky130_fd_sc_ls__or4b_1.netlist.tsv
index 1a16eb6..2a07748 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_1.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__or4b_1	A:I B:I C:I D_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	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/or4b/sky130_fd_sc_ls__or4b_1.spice b/cells/or4b/sky130_fd_sc_ls__or4b_1.spice
index 1debc54..4225ecb 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_1.spice
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_ls__or4b_1 A B C D_N VGND VNB VPB VPWR X
-M1000 VGND C a_228_74# VNB nshort w=550000u l=150000u
-+  ad=7.8175e+11p pd=6.35e+06u as=6.6275e+11p ps=4.61e+06u
-M1001 a_356_368# a_27_74# a_228_74# VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.95e+11p ps=2.59e+06u
-M1002 VPWR A a_524_368# VPB phighvt w=1e+06u l=150000u
-+  ad=8.712e+11p pd=5.69e+06u as=3.9e+11p ps=2.78e+06u
-M1003 a_524_368# B a_440_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1004 X a_228_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 X a_228_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1006 VPWR D_N a_27_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1007 a_228_74# B VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND D_N a_27_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1009 a_440_368# C a_356_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_228_74# a_27_74# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_228_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_228_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_524_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_228_74# a_27_74# a_356_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VGND a_27_74# a_228_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 a_228_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 a_356_368# C a_440_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 VPWR a_228_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 VGND B a_228_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 a_27_74# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_228_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 a_27_74# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 a_440_368# B a_524_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_2.cdl b/cells/or4b/sky130_fd_sc_ls__or4b_2.cdl
index f7fd745..a726779 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_2.cdl
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__or4b_2 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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
 .ENDS sky130_fd_sc_ls__or4b_2
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_2.netlist.tsv b/cells/or4b/sky130_fd_sc_ls__or4b_2.netlist.tsv
index 002092f..a16673f 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_2.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__or4b_2	A:I B:I C:I D_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_2.spice b/cells/or4b/sky130_fd_sc_ls__or4b_2.spice
index 67e9faf..78e6998 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_2.spice
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__or4b_2 A B C D_N VGND VNB VPB VPWR X
-M1000 VPWR a_190_48# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.828e+11p pd=6.34e+06u as=3.36e+11p ps=2.84e+06u
-M1001 a_190_48# a_27_368# a_638_392# VPB phighvt w=1e+06u l=150000u
-+  ad=4.45e+11p pd=2.89e+06u as=3.9e+11p ps=2.78e+06u
-M1002 a_190_48# C VGND VNB nshort w=640000u l=150000u
-+  ad=4.896e+11p pd=4.09e+06u as=1.10645e+12p ps=8.83e+06u
-M1003 a_190_48# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_190_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1005 VPWR D_N a_27_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1006 VGND B a_190_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_536_392# B a_452_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.6e+11p pd=2.72e+06u as=2.7e+11p ps=2.54e+06u
-M1008 a_638_392# C a_536_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND D_N a_27_368# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1010 VGND a_27_368# a_190_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_190_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_452_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_190_48# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_190_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VPWR a_190_48# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND C a_190_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_27_368# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 VGND A a_190_48# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_27_368# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_452_392# B a_536_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VPWR A a_452_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 X a_190_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_638_392# a_27_368# a_190_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_190_48# a_27_368# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_536_392# C a_638_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 VGND a_190_48# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 a_190_48# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_4.cdl b/cells/or4b/sky130_fd_sc_ls__or4b_4.cdl
index 54e2af7..4d5da45 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_4.cdl
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_ls__or4b_4 A B C D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B 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
-MMP3 sndPC D VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C 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
-MMIP3 D D_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D 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
-MMIP4 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y B 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
-MMN2 y C 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
-MMN3 y D 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
-MMIN3 D D_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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
 .ENDS sky130_fd_sc_ls__or4b_4
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_4.netlist.tsv b/cells/or4b/sky130_fd_sc_ls__or4b_4.netlist.tsv
index 65bbe4a..920874a 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_4.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_ls__or4b_4	A:I B:I C:I D_N: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_4.spice b/cells/or4b/sky130_fd_sc_ls__or4b_4.spice
index b480c0d..14744c5 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_4.spice
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__or4b_4 A B C D_N VGND VNB VPB VPWR X
-M1000 a_116_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=6.5e+11p pd=5.3e+06u as=1.3812e+12p ps=1.127e+07u
-M1001 a_27_392# C a_496_392# VPB phighvt w=1e+06u l=150000u
-+  ad=9.4e+11p pd=7.88e+06u as=6.5e+11p ps=5.3e+06u
-M1002 VPWR a_27_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1003 VPWR D_N a_563_48# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1004 a_27_392# B a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=5.069e+11p pd=4.33e+06u as=1.3615e+12p ps=1.11e+07u
-M1006 X a_27_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_496_392# C a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND D_N a_563_48# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.2135e+11p ps=2.98e+06u
-M1010 VGND a_27_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=1.2395e+12p ps=7.79e+06u
-M1012 a_27_74# a_563_48# a_496_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1013 VPWR a_27_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_116_392# B a_27_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_74# a_563_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_496_392# a_563_48# a_27_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B a_27_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_27_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_27_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_496_392# C a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 X a_27_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_496_392# a_563_48# a_27_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_27_74# C VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VGND a_563_48# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VPWR A a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_563_48# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 X a_27_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_74# a_563_48# a_496_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_27_392# B a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_116_392# B a_27_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 VGND a_27_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_27_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_563_48# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_27_392# C a_496_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_116_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 VPWR a_27_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.cdl b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.cdl
index 42c4206..e95411d 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.cdl
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__or4bb_1 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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_ls__or4bb_1
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.netlist.tsv b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.netlist.tsv
index a052394..3c999b9 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__or4bb_1	A:I B:I C_N:I D_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	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/or4bb/sky130_fd_sc_ls__or4bb_1.spice b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.spice
index 332ce92..85a2f46 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.spice
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_ls__or4bb_1 A B C_N D_N VGND VNB VPB VPWR X
-M1000 a_446_378# a_216_424# a_357_378# VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=2.95e+11p ps=2.59e+06u
-M1001 a_357_378# a_216_424# VGND VNB nshort w=550000u l=150000u
-+  ad=3.7675e+11p pd=3.57e+06u as=9.22e+11p ps=7.96e+06u
-M1002 a_626_378# B a_530_378# VPB phighvt w=1e+06u l=150000u
-+  ad=3.9e+11p pd=2.78e+06u as=3.3e+11p ps=2.66e+06u
-M1003 VGND C_N a_27_424# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1004 a_216_424# D_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1005 VGND A a_357_378# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_216_424# D_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.3785e+11p pd=2.97e+06u as=7.664e+11p ps=5.49e+06u
-M1007 X a_357_378# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1008 VPWR C_N a_27_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1009 a_357_378# B VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_357_378# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1011 a_530_378# a_27_424# a_446_378# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_626_378# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_27_424# a_357_378# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_357_378# a_27_424# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 VPWR a_357_378# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 VGND D_N a_216_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 a_357_378# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 VGND a_357_378# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_626_378# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_27_424# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 VGND a_216_424# a_357_378# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 a_357_378# a_216_424# a_446_378# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 VGND B a_357_378# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 a_446_378# a_27_424# a_530_378# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_27_424# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 VPWR D_N a_216_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_530_378# B a_626_378# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.cdl b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.cdl
index aba3ee0..34bd754 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.cdl
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__or4bb_2 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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
 .ENDS sky130_fd_sc_ls__or4bb_2
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.netlist.tsv b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.netlist.tsv
index 53d753a..002f45f 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__or4bb_2	A:I B:I C_N:I D_N: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	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.spice b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.spice
index 0b3968b..25df4d1 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.spice
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__or4bb_2 A B C_N D_N VGND VNB VPB VPWR X
-M1000 a_182_270# B VGND VNB nshort w=640000u l=150000u
-+  ad=5.192e+11p pd=4.27e+06u as=1.16472e+12p ps=9.37e+06u
-M1001 a_548_110# C_N VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.436e+11p pd=2.26e+06u as=1.0664e+12p ps=8.54e+06u
-M1002 X a_182_270# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 VGND a_182_270# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND D_N a_27_424# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1005 a_587_392# a_548_110# a_503_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.6e+11p pd=2.72e+06u as=2.7e+11p ps=2.54e+06u
-M1006 a_689_392# B a_587_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 a_548_110# C_N VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1008 X a_182_270# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1009 a_503_392# a_27_424# a_182_270# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1010 VPWR D_N a_27_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1011 a_182_270# a_27_424# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A a_182_270# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_182_270# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_548_110# a_182_270# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_689_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_182_270# a_548_110# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 X a_182_270# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_27_424# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 VGND a_27_424# a_182_270# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_182_270# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR C_N a_548_110# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 VGND B a_182_270# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_689_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_503_392# a_548_110# a_587_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_182_270# a_27_424# a_503_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 VPWR a_182_270# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_27_424# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_587_392# B a_689_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 VGND a_182_270# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 VGND C_N a_548_110# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X15 X a_182_270# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.cdl b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.cdl
index b40bf10..1eafeb7 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.cdl
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_ls__or4bb_4 A B C_N D_N VGND VNB VPB VPWR X
 *.PININFO A:I B:I C_N:I D_N:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP2 sndPB C VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP3 sndPC D VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 C C_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 D D_N VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP4 X y VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y 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
-MMP2 sndPB C VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B 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
-MMP3 sndPC D VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C 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
-MMIP2 C C_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D 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
-MMIP3 D D_N VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y B 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
-MMN2 y C 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
-MMN3 y D 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
-MMIN2 C C_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y 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
 .ENDS sky130_fd_sc_ls__or4bb_4
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.netlist.tsv b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.netlist.tsv
index 31d87f0..32fb6cc 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_ls__or4bb_4	A:I B:I C_N:I D_N: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	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	C	C_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	D	D_N	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.spice b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.spice
index 12b1687..01ad260 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.spice
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__or4bb_4 A B C_N D_N VGND VNB VPB VPWR X
-M1000 a_791_392# a_27_94# a_193_277# VPB phighvt w=1e+06u l=150000u
-+  ad=8.9e+11p pd=7.78e+06u as=3e+11p ps=2.6e+06u
-M1001 X a_193_277# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=9.856e+11p pd=6.24e+06u as=1.65e+12p ps=1.178e+07u
-M1002 a_1060_392# a_678_368# a_791_392# VPB phighvt w=1e+06u l=150000u
-+  ad=6.5e+11p pd=5.3e+06u as=0p ps=0u
-M1003 VGND A a_193_277# VNB nshort w=740000u l=150000u
-+  ad=2.0924e+12p pd=1.558e+07u as=1.4134e+12p ps=6.78e+06u
-M1004 a_1273_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=8.9e+11p pd=7.78e+06u as=0p ps=0u
-M1005 a_678_368# C_N VGND VNB nshort w=640000u l=150000u
-+  ad=1.719e+11p pd=1.85e+06u as=0p ps=0u
-M1006 VGND D_N a_27_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1007 a_791_392# a_678_368# a_1060_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_193_277# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_193_277# VGND VNB nshort w=740000u l=150000u
-+  ad=6.919e+11p pd=4.83e+06u as=0p ps=0u
-M1010 a_193_277# a_27_94# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_193_277# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_678_368# C_N VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1013 a_1060_392# B a_1273_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_193_277# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR D_N a_27_94# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1016 X a_193_277# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1273_392# B a_1060_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_193_277# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_193_277# a_27_94# a_791_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_678_368# a_193_277# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_193_277# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A a_1273_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_193_277# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1273_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_1273_392# B a_1060_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 X a_193_277# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_193_277# a_27_94# a_791_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND a_193_277# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 X a_193_277# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR A a_1273_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_193_277# a_678_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_791_392# a_678_368# a_1060_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_27_94# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VPWR a_193_277# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 VGND C_N a_678_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_27_94# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_1060_392# a_678_368# a_791_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_1060_392# B a_1273_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_193_277# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 VGND a_193_277# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND B a_193_277# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VPWR C_N a_678_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_791_392# a_27_94# a_193_277# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 VGND a_27_94# a_193_277# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR a_193_277# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 X a_193_277# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 X a_193_277# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.cdl b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.cdl
index b9d99d0..89b8022 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.cdl
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_ls__sdfbbn_1 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O Q_N:O
-MI98 net105 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 net105 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 net105 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI120 net105 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI46 clkneg clkpos 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
-MI642 RESET RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net176 SET_B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net176 SET_B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net213 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
-MI677 M1 RESET VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 Q net213 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
-MI649 net160 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net145 net117 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net117 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
-MI652 net213 net117 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net105 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkpos CLK_N 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
-MI668 S0 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net128 M1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net117 RESET VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI649 net160 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net117 S0 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
-MI7 net116 SET_B 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
-MI639 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 net105 D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 net105 sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB 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
-MI669 S0 clkneg VPB 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
-MI660 Q net213 VPB 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
-MI9 net117 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net265 M1 VPB 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
-MI678 net216 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI654 net145 net117 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net257 net117 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI651 Q_N net117 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
-MI664 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net213 net117 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net105 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI668 S0 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net128 M1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net117 RESET 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
+MI3 net117 S0 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
-MI10 net117 SET_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI7 net116 SET_B 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
-MI11 net268 RESET VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net241 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net105 clkpos VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI94 net105 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI101 net105 sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB 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
-MI663 net213 net117 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI679 M1 SET_B VPB 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
-MI661 Q_N net117 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI669 S0 clkneg VPB 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
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net213 VPB 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
+MI9 net117 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net265 M1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net216 RESET VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net257 net117 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net117 SET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net268 RESET VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net241 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net105 clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB 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
+MI680 M1 M0 VPB 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
+MI663 net213 net117 VPB 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
+MI661 Q_N net117 VPB 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
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfbbn_1
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.netlist.tsv b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.netlist.tsv
index 73114f5..8a80b2c 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.netlist.tsv
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_ls__sdfbbn_1	CLK_N:I D:I RESET_B: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
-MI98	MOSFET	net105	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	net105	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net176	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net176	SET_B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net213	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net176	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net160	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net160	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net145	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net145	net117	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net117	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net213	net117	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net105	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net128	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net128	M1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net117	RESET	net116	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net117	S0	net116	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net116	SET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	net105	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	net105	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net265	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net213	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net117	S0	net268	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net265	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net216	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net257	net117	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net257	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net117	SET_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net268	RESET	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net241	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net105	clkpos	M0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net241	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net216	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net213	net117	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net117	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	net105	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	net105	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net176	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net176	SET_B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net213	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net176	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net160	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net160	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net145	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net145	net117	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net117	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net213	net117	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net105	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net128	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net128	M1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net117	RESET	net116	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net117	S0	net116	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net116	SET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	net105	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	net105	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net265	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net213	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net117	S0	net268	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net265	M1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net216	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net257	net117	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net257	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net117	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net268	RESET	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net241	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net105	clkpos	M0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net241	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net216	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net213	net117	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net117	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.spice b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.spice
index c22ff07..843d129 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.spice
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.spice
@@ -17,100 +17,52 @@
 
 .subckt sky130_fd_sc_ls__sdfbbn_1 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR
 + Q Q_N
-M1000 a_305_119# D a_197_119# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.129e+11p ps=3.17e+06u
-M1001 a_197_119# a_867_82# a_1159_497# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1002 VGND RESET_B a_1579_258# VNB nshort w=420000u l=150000u
-+  ad=2.11888e+12p pd=1.742e+07u as=1.197e+11p ps=1.41e+06u
-M1003 a_27_464# a_353_93# a_197_119# VPB phighvt w=640000u l=150000u
-+  ad=3.744e+11p pd=3.73e+06u as=4.128e+11p ps=3.85e+06u
-M1004 a_119_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 a_977_243# a_1159_497# a_1434_78# VNB nshort w=550000u l=150000u
-+  ad=2.09e+11p pd=1.86e+06u as=5.1045e+11p ps=4.25e+06u
-M1006 a_1159_497# a_867_82# a_1081_497# VPB phighvt w=420000u l=150000u
-+  ad=2.266e+11p pd=2.05e+06u as=1.008e+11p ps=1.32e+06u
-M1007 Q_N a_2133_410# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1008 VPWR a_2133_410# a_2088_508# VPB phighvt w=420000u l=150000u
-+  ad=3.0812e+12p pd=2.468e+07u as=1.008e+11p ps=1.32e+06u
-M1009 VGND a_2133_410# a_2164_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1010 a_2392_74# SET_B VGND VNB nshort w=740000u l=150000u
-+  ad=4.947e+11p pd=4.37e+06u as=0p ps=0u
-M1011 a_1903_424# a_977_243# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1012 Q a_3078_384# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1013 VGND CLK_N a_662_82# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1014 a_867_82# a_662_82# VGND VNB nshort w=740000u l=150000u
-+  ad=3.219e+11p pd=2.35e+06u as=0p ps=0u
-M1015 a_1159_497# a_662_82# a_1151_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1016 a_353_93# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.888e+11p pd=1.87e+06u as=0p ps=0u
-M1017 a_353_93# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1018 VGND a_2133_410# a_3078_384# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1019 a_1151_119# a_977_243# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_2133_410# a_1954_119# a_2509_392# VPB phighvt w=1e+06u l=150000u
-+  ad=5.9e+11p pd=5.18e+06u as=2.7e+11p ps=2.54e+06u
-M1021 VGND SET_B a_1434_78# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1954_119# a_662_82# a_1876_119# VNB nshort w=550000u l=150000u
-+  ad=4.807e+11p pd=2.9e+06u as=1.32e+11p ps=1.58e+06u
-M1023 a_1081_497# a_977_243# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_2133_410# a_3078_384# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1025 VPWR SCD a_27_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR CLK_N a_662_82# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1027 VPWR RESET_B a_1579_258# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.625e+11p ps=3.71e+06u
-M1028 a_2392_74# a_1954_119# a_2133_410# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.812e+11p ps=2.24e+06u
-M1029 a_1954_119# a_867_82# a_1903_424# VPB phighvt w=840000u l=150000u
-+  ad=2.856e+11p pd=2.45e+06u as=0p ps=0u
-M1030 a_197_119# SCE a_119_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_353_93# a_305_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2509_392# a_1579_258# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1579_258# a_1528_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1034 Q a_3078_384# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1035 a_2088_508# a_662_82# a_1954_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_2133_410# a_1579_258# a_2392_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_197_119# D a_212_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1038 a_867_82# a_662_82# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1039 VPWR SET_B a_2133_410# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_2164_119# a_867_82# a_1954_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_197_119# a_662_82# a_1159_497# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1528_424# a_1159_497# a_977_243# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=6.342e+11p ps=4.87e+06u
-M1043 a_977_243# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1876_119# a_977_243# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1434_78# a_1579_258# a_977_243# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_212_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 Q_N a_2133_410# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
+X0 VPWR SET_B a_977_243# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_2164_119# a_2133_410# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_2509_392# a_1954_119# a_2133_410# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_3078_384# a_2133_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 a_1903_424# a_867_82# a_1954_119# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_1579_258# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VGND a_2133_410# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_1151_119# a_662_82# a_1159_497# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1434_78# a_1159_497# a_977_243# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_1434_78# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 a_305_119# a_353_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR SCE a_353_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VPWR a_977_243# a_1081_497# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_2088_508# a_2133_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_212_464# D a_197_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 VPWR a_662_82# a_867_82# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VGND SCD a_119_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR SCE a_212_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 VGND a_662_82# a_867_82# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_977_243# a_1159_497# a_1528_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_1159_497# a_662_82# a_197_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_1579_258# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_27_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_1081_497# a_867_82# a_1159_497# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_662_82# CLK_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_3078_384# a_2133_410# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X26 VPWR a_977_243# a_1903_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_1528_424# a_1579_258# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X28 VPWR a_2133_410# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 VGND a_3078_384# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 a_1954_119# a_662_82# a_2088_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_2133_410# a_1954_119# a_2392_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 VGND a_977_243# a_1876_119# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X33 VGND SET_B a_2392_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 a_119_119# SCE a_197_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_197_119# a_353_93# a_27_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X36 a_1954_119# a_867_82# a_2164_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VGND a_977_243# a_1151_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_977_243# a_1579_258# a_1434_78# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X39 a_662_82# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X40 a_1159_497# a_867_82# a_197_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 VPWR a_3078_384# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X42 VPWR a_1579_258# a_2509_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X43 a_1876_119# a_662_82# a_1954_119# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X44 a_197_119# D a_305_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 a_2133_410# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X46 a_2392_74# a_1579_258# a_2133_410# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X47 VGND SCE a_353_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.cdl b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.cdl
index b7ea42b..64c295e 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.cdl
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_ls__sdfbbn_2 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O Q_N:O
-MI98 net105 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 net105 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 net105 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI120 net105 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI46 clkneg clkpos 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
-MI642 RESET RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net176 SET_B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net176 SET_B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net213 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
-MI677 M1 RESET VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkpos CLK_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI653 Q net213 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
-MI649 net160 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net145 net117 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net117 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
-MI652 net213 net117 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net105 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkpos CLK_N 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
-MI668 S0 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net128 M1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net117 RESET VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI649 net160 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net117 S0 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
-MI7 net116 SET_B 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
-MI639 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 net105 D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 net105 sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB 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
-MI669 S0 clkneg VPB 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
-MI660 Q net213 VPB 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
-MI9 net117 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net265 M1 VPB 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
-MI678 net216 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI654 net145 net117 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net257 net117 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI651 Q_N net117 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
-MI664 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net213 net117 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net105 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI668 S0 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net128 M1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net117 RESET 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
+MI3 net117 S0 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
-MI10 net117 SET_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI7 net116 SET_B 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
-MI11 net268 RESET VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net241 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net105 clkpos VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI94 net105 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI101 net105 sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK_N VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI680 M1 M0 VPB 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
-MI663 net213 net117 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI679 M1 SET_B VPB 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
-MI661 Q_N net117 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MI669 S0 clkneg VPB 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
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net213 VPB 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
+MI9 net117 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net265 M1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net216 RESET VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net257 net117 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net117 SET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net268 RESET VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net241 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net105 clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkpos CLK_N VPB 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
+MI680 M1 M0 VPB 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
+MI663 net213 net117 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net117 VPB pfet_01v8_hvt m=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
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfbbn_2
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.netlist.tsv b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.netlist.tsv
index 6f828b4..9d0feca 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.netlist.tsv
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_ls__sdfbbn_2	CLK_N:I D:I RESET_B: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
-MI98	MOSFET	net105	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	net105	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net176	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net176	SET_B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net213	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net176	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net160	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net160	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net145	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net145	net117	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net117	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net213	net117	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net105	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net128	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net128	M1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net117	RESET	net116	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net117	S0	net116	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net116	SET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	net105	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	net105	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net265	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net213	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net117	S0	net268	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net265	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net216	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net257	net117	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net257	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net117	SET_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net268	RESET	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net241	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net105	clkpos	M0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net241	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net216	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net213	net117	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net117	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	net105	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	net105	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net176	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net176	SET_B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net213	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net176	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net160	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net160	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net145	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net145	net117	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net117	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net213	net117	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net105	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net128	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net128	M1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net117	RESET	net116	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net117	S0	net116	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net116	SET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	net105	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	net105	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net265	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net213	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net117	S0	net268	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net265	M1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net216	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net257	net117	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net257	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net117	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net268	RESET	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net241	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net105	clkpos	M0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net241	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net216	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net213	net117	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net117	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.spice b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.spice
index e992c15..3c499d6 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.spice
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.spice
@@ -17,108 +17,56 @@
 
 .subckt sky130_fd_sc_ls__sdfbbn_2 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR
 + Q Q_N
-M1000 a_197_119# D a_206_464# VPB phighvt w=640000u l=150000u
-+  ad=4.128e+11p pd=3.85e+06u as=1.536e+11p ps=1.76e+06u
-M1001 VPWR a_3272_94# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.12873e+12p pd=3.022e+07u as=3.36e+11p ps=2.84e+06u
-M1002 a_2452_74# SET_B VGND VNB nshort w=740000u l=150000u
-+  ad=5.7435e+11p pd=4.64e+06u as=2.86405e+12p ps=2.37e+07u
-M1003 VGND a_2216_410# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1004 a_119_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 VGND RESET_B a_1643_257# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1006 a_197_119# a_868_368# a_1154_464# VNB nshort w=420000u l=150000u
-+  ad=4.347e+11p pd=3.75e+06u as=1.281e+11p ps=1.45e+06u
-M1007 a_2452_74# a_1997_82# a_2216_410# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1008 VPWR a_2216_410# a_2171_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 a_1986_424# a_1007_366# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1010 a_1997_82# a_868_368# a_1986_424# VPB phighvt w=840000u l=150000u
-+  ad=2.856e+11p pd=2.45e+06u as=0p ps=0u
-M1011 VPWR SET_B a_2216_410# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.9e+11p ps=5.18e+06u
-M1012 a_2247_82# a_868_368# a_1997_82# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=4.945e+11p ps=3.3e+06u
-M1013 a_197_119# a_688_98# a_1154_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.266e+11p ps=2.05e+06u
-M1014 a_2556_392# a_1643_257# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1015 a_27_464# a_341_410# a_197_119# VPB phighvt w=640000u l=150000u
-+  ad=3.776e+11p pd=3.74e+06u as=0p ps=0u
-M1016 a_1154_464# a_688_98# a_1185_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 a_1007_366# a_1154_464# a_1473_73# VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=6.0335e+11p ps=4.55e+06u
-M1018 a_1473_73# a_1643_257# a_1007_366# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_2216_410# a_3272_94# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1020 a_1997_82# a_688_98# a_1902_125# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=2.16375e+11p ps=2.18e+06u
-M1021 Q_N a_2216_410# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Q a_3272_94# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1023 Q_N a_2216_410# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1024 a_341_410# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.888e+11p pd=1.87e+06u as=0p ps=0u
-M1025 VGND a_341_410# a_363_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1026 VPWR RESET_B a_1643_257# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1027 a_1185_125# a_1007_366# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR SCD a_27_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_206_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1643_257# a_1592_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1031 a_2171_508# a_688_98# a_1997_82# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_197_119# SCE a_119_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_2216_410# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1592_424# a_1154_464# a_1007_366# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=9.954e+11p ps=5.73e+06u
-M1035 VGND CLK_N a_688_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1036 VPWR CLK_N a_688_98# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1037 a_341_410# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1038 a_2216_410# a_1643_257# a_2452_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1154_464# a_868_368# a_1070_464# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1040 Q a_3272_94# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND a_3272_94# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_363_119# D a_197_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_868_368# a_688_98# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1044 VGND a_2216_410# a_2247_82# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1070_464# a_1007_366# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1902_125# a_1007_366# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND SET_B a_1473_73# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_868_368# a_688_98# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1049 a_1007_366# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VPWR a_2216_410# a_3272_94# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.9e+11p ps=2.58e+06u
-M1051 a_2216_410# a_1997_82# a_2556_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1007_366# a_1154_464# a_1592_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_2171_508# a_2216_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1154_464# a_868_368# a_197_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1473_73# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 Q_N a_2216_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_3272_94# a_2216_410# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_363_119# a_341_410# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_1643_257# a_2556_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 VGND SET_B a_2452_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND SCE a_341_410# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_3272_94# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_1643_257# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_688_98# a_868_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND a_1007_366# a_1902_125# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X14 a_1997_82# a_868_368# a_2247_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_2556_392# a_1997_82# a_2216_410# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 a_2247_82# a_2216_410# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_1007_366# a_1986_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VGND SCD a_119_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_206_464# D a_197_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 VPWR SCE a_341_410# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_1473_73# a_1154_464# a_1007_366# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X22 VPWR a_688_98# a_868_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_27_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_1643_257# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_3272_94# a_2216_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 VPWR a_2216_410# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_2452_74# a_1643_257# a_2216_410# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 Q a_3272_94# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_2216_410# a_1997_82# a_2452_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 a_1154_464# a_688_98# a_197_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 a_1007_366# a_1643_257# a_1473_73# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X32 a_119_119# SCE a_197_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1185_125# a_688_98# a_1154_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND a_2216_410# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 a_1997_82# a_688_98# a_2171_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 a_688_98# CLK_N VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 a_1986_424# a_868_368# a_1997_82# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X38 a_1902_125# a_688_98# a_1997_82# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X39 a_2216_410# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X40 VPWR SCE a_206_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X41 a_1070_464# a_868_368# a_1154_464# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X42 VPWR SET_B a_1007_366# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X43 a_197_119# a_341_410# a_27_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X44 a_197_119# D a_363_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 VGND a_1007_366# a_1185_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 VGND a_3272_94# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X47 a_1592_424# a_1643_257# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X48 Q a_3272_94# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X49 VPWR a_1007_366# a_1070_464# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X50 a_688_98# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X51 Q_N a_2216_410# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.cdl b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.cdl
index 302e173..05f2a05 100644
--- a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.cdl
+++ b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_ls__sdfbbp_1 CLK D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O Q_N:O
-MI98 net105 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 net105 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 net105 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI120 net105 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
+MI46 clkpos clkneg 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
-MI642 RESET RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 RESET RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI676 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net176 SET_B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI675 net176 SET_B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net213 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
-MI677 M1 RESET VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI649 net160 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net145 net117 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net213 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
-MI651 Q_N net117 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
-MI652 net213 net117 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net105 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI648 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI668 S0 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net128 M1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net117 RESET VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK 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
-MI3 net117 S0 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
-MI7 net116 SET_B 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
-MI639 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 net105 D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 net105 sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI649 net160 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI679 M1 SET_B VPB 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
-MI669 S0 clkneg VPB 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
-MI660 Q net213 VPB 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
-MI9 net117 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI670 net265 M1 VPB 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
-MI678 net216 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI655 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net257 net117 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net145 net117 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 Q_N net117 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
+MI652 net213 net117 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net105 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI668 S0 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net128 M1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net117 RESET 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
+MI3 net117 S0 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
-MI10 net117 SET_B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI7 net116 SET_B 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
-MI11 net268 RESET VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 net241 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net105 clkpos VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 RESET RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI94 net105 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI101 net105 sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI680 M1 M0 VPB 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
-MI663 net213 net117 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net117 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI679 M1 SET_B VPB 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
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkneg VPB 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
+MI660 Q net213 VPB 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
+MI9 net117 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI670 net265 M1 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net216 RESET VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net257 net117 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net117 SET_B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net268 RESET VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net241 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net105 clkpos VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 RESET RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI680 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net213 net117 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net117 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfbbp_1
diff --git a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.netlist.tsv b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.netlist.tsv
index 4f5d168..dae137a 100644
--- a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.netlist.tsv
+++ b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_ls__sdfbbp_1	CLK:I D:I RESET_B: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
-MI98	MOSFET	net105	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	net105	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	RESET	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	M1	M0	net176	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net176	SET_B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net213	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net176	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net160	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net160	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	S0	clkneg	net145	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net145	net117	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net117	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net213	net117	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net105	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	S0	clkpos	net128	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net128	M1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net117	RESET	net116	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net117	S0	net116	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net116	SET_B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	net105	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	net105	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkneg	net265	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net213	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net117	S0	net268	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net265	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net216	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net257	net117	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net257	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net117	SET_B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net268	RESET	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net241	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net105	clkpos	M0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net241	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	RESET	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net216	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net213	net117	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net117	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	net105	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	net105	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	RESET	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	M1	M0	net176	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net176	SET_B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net213	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net176	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net160	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net160	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	S0	clkneg	net145	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net145	net117	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	net117	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net213	net117	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net105	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	S0	clkpos	net128	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net128	M1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net117	RESET	net116	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net117	S0	net116	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net116	SET_B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	net105	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	net105	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkneg	net265	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net213	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net117	S0	net268	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net265	M1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net216	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net257	net117	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	S0	clkpos	net257	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net117	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net268	RESET	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net241	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net105	clkpos	M0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net241	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	RESET	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net216	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net213	net117	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net117	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.spice b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.spice
index 431e3df..a67d7d3 100644
--- a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.spice
+++ b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.spice
@@ -17,100 +17,52 @@
 
 .subckt sky130_fd_sc_ls__sdfbbp_1 CLK D RESET_B SCD SCE SET_B VGND VNB VPB VPWR Q
 + Q_N
-M1000 a_877_98# a_622_98# VGND VNB nshort w=740000u l=150000u
-+  ad=2.516e+11p pd=2.16e+06u as=2.22013e+12p ps=1.787e+07u
-M1001 a_1878_420# a_877_98# a_1880_119# VNB nshort w=550000u l=150000u
-+  ad=2.3445e+11p pd=2.34e+06u as=1.155e+11p ps=1.52e+06u
-M1002 a_2271_74# SET_B VGND VNB nshort w=740000u l=150000u
-+  ad=4.218e+11p pd=4.1e+06u as=0p ps=0u
-M1003 Q a_2881_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1004 a_877_98# a_622_98# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=3.08725e+12p ps=2.441e+07u
-M1005 a_1221_419# a_622_98# a_1092_96# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=2.326e+11p ps=2.11e+06u
-M1006 a_119_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 VGND RESET_B a_1625_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 a_1878_420# a_622_98# a_1766_379# VPB phighvt w=840000u l=150000u
-+  ad=2.898e+11p pd=2.46e+06u as=3.69e+11p ps=2.91e+06u
-M1009 a_299_119# D a_197_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.709e+11p ps=2.97e+06u
-M1010 a_197_119# D a_218_464# VPB phighvt w=640000u l=150000u
-+  ad=3.808e+11p pd=3.75e+06u as=1.728e+11p ps=1.82e+06u
-M1011 VPWR a_2037_442# a_2881_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1012 VGND a_341_93# a_299_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1880_119# a_1250_231# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1092_96# a_877_98# a_197_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1250_231# a_1092_96# a_1418_125# VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=7.81e+11p ps=5.37e+06u
-M1016 a_1418_125# a_1625_93# a_1250_231# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_1625_93# a_2384_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1018 a_218_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_464# a_341_93# a_197_119# VPB phighvt w=640000u l=150000u
-+  ad=3.776e+11p pd=3.74e+06u as=0p ps=0u
-M1020 a_1986_504# a_877_98# a_1878_420# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1021 Q_N a_2037_442# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1022 a_1418_125# SET_B VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_2061_74# a_622_98# a_1878_420# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1024 a_1250_231# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1025 VGND a_2037_442# a_2881_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1026 VPWR SCD a_27_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_341_93# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.888e+11p pd=1.87e+06u as=0p ps=0u
-M1028 VPWR RESET_B a_1625_93# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1029 a_197_119# SCE a_119_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1192_96# a_877_98# a_1092_96# VNB nshort w=420000u l=150000u
-+  ad=1.61875e+11p pd=1.78e+06u as=1.47e+11p ps=1.54e+06u
-M1031 a_2037_442# a_1878_420# a_2271_74# VNB nshort w=740000u l=150000u
-+  ad=2.886e+11p pd=2.26e+06u as=0p ps=0u
-M1032 Q_N a_2037_442# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1033 VPWR a_1625_93# a_1580_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1034 a_1766_379# a_1250_231# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1092_96# a_622_98# a_197_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_2037_442# a_1986_504# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_2037_442# SET_B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=4e+11p pd=2.8e+06u as=0p ps=0u
-M1038 Q a_2881_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1039 a_1580_379# a_1092_96# a_1250_231# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR CLK a_622_98# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1041 a_341_93# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1042 VGND CLK a_622_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1043 a_2271_74# a_1625_93# a_2037_442# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_2384_392# a_1878_420# a_2037_442# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR a_1250_231# a_1221_419# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND a_1250_231# a_1192_96# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_2037_442# a_2061_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_2037_442# a_1625_93# a_2271_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 VGND a_2037_442# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_1250_231# a_1625_93# a_1418_125# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 VPWR a_2881_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_1766_379# a_622_98# a_1878_420# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_1878_420# a_877_98# a_1986_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_1986_504# a_2037_442# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_1580_379# a_1625_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_2881_74# a_2037_442# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_197_119# a_341_93# a_27_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_1880_119# a_877_98# a_1878_420# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 a_197_119# a_877_98# a_1092_96# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VGND SCD a_119_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_622_98# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_1250_231# a_1092_96# a_1580_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_622_98# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_27_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 VPWR SET_B a_1250_231# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VGND a_1250_231# a_1880_119# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X19 a_2384_392# a_1625_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 VGND a_2881_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_1878_420# a_622_98# a_2061_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_2881_74# a_2037_442# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X23 a_197_119# D a_299_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_1250_231# a_1766_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_1092_96# a_877_98# a_1192_96# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR a_2037_442# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 VPWR SCE a_218_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 a_1221_419# a_1250_231# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 VGND SET_B a_2271_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X30 a_119_119# SCE a_197_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1192_96# a_1250_231# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VGND SET_B a_1418_125# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X33 a_1092_96# a_622_98# a_1221_419# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 VGND SCE a_341_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_1418_125# a_1092_96# a_1250_231# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X36 a_2061_74# a_2037_442# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_1625_93# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_218_464# D a_197_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X39 VPWR SCE a_341_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X40 VGND a_622_98# a_877_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X41 VPWR a_622_98# a_877_98# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X42 a_299_119# a_341_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_197_119# a_622_98# a_1092_96# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 VPWR SET_B a_2037_442# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X45 a_2037_442# a_1878_420# a_2384_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X46 a_1625_93# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X47 a_2271_74# a_1878_420# a_2037_442# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.cdl b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.cdl
index d161ce1..b619987 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_ls__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O Q_N:O
-MI642 clkneg CLK VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK 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
-MI651 Q_N s0 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net94 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net128 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI33 net121 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI651 Q_N s0 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
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net109 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net197 s0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net197 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
-MI654 net93 net94 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net94 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net128 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net121 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net109 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net197 s0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net197 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
+MI654 net93 net94 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net148 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net148 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net225 net94 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net94 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI662 net225 net94 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net94 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net94 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net204 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net197 s0 VPB 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
+MI660 Q net197 VPB 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
+MI661 Q_N s0 VPB 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
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net94 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net204 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net197 s0 VPB 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
-MI660 Q net197 VPB 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
-MI661 Q_N s0 VPB 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
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfrbp_1
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.netlist.tsv
index a319ba2..b3adb1a 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ls__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
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	s0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net94	s0	net128	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net128	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net121	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net109	M1	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net93	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net197	s0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net197	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net93	net94	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net148	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net148	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net148	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net225	net94	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net94	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net225	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net94	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net204	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net204	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net197	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net197	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net94	s0	net128	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net128	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net121	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net109	M1	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net93	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net197	s0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net197	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net93	net94	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net148	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net148	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net148	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net225	net94	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net94	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net225	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net94	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net204	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net204	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net197	s0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net197	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.spice b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.spice
index d7213d7..0ecc160 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.spice
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_ls__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1320_119# a_1034_392# a_1234_119# VNB nshort w=420000u l=150000u
-+  ad=9.87e+10p pd=1.31e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VGND a_1747_74# a_2513_424# VNB nshort w=550000u l=150000u
-+  ad=1.77802e+12p pd=1.475e+07u as=1.4575e+11p ps=1.63e+06u
-M1002 Q_N a_1747_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=2.27322e+12p ps=1.901e+07u
-M1003 VGND a_2008_48# a_1966_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_1234_119# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.499e+11p pd=2.87e+06u as=0p ps=0u
-M1005 a_2124_74# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 Q_N a_1747_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1007 a_2008_48# a_1747_74# a_2124_74# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 a_312_81# a_27_74# a_225_81# VNB nshort w=420000u l=150000u
-+  ad=1.407e+11p pd=1.51e+06u as=2.499e+11p ps=2.87e+06u
-M1009 a_1966_74# a_835_98# a_1747_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.519e+11p ps=3.17e+06u
-M1010 a_1332_457# a_835_98# a_1234_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1011 VGND RESET_B a_1397_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1012 a_409_81# D a_312_81# VNB nshort w=420000u l=150000u
-+  ad=3.339e+11p pd=3.27e+06u as=0p ps=0u
-M1013 a_1747_74# a_835_98# a_1367_93# VPB phighvt w=1e+06u l=150000u
-+  ad=4.1485e+11p pd=3.51e+06u as=3e+11p ps=2.6e+06u
-M1014 a_409_81# D a_338_464# VPB phighvt w=640000u l=150000u
-+  ad=5.047e+11p pd=5.18e+06u as=1.728e+11p ps=1.82e+06u
-M1015 a_1969_489# a_1034_392# a_1747_74# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1016 a_225_81# SCD a_545_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1017 VPWR a_2008_48# a_1969_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_2513_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1019 a_512_464# a_27_74# a_409_81# VPB phighvt w=640000u l=150000u
-+  ad=2.56e+11p pd=2.08e+06u as=0p ps=0u
-M1020 a_1747_74# a_1034_392# a_1367_93# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.856e+11p ps=1.86e+06u
-M1021 a_1397_119# a_1367_93# a_1320_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_545_81# SCE a_409_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR SCD a_512_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR CLK a_835_98# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1025 VGND CLK a_835_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.619e+11p ps=2.38e+06u
-M1026 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.792e+11p ps=3.09e+06u
-M1027 a_2008_48# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1028 a_1034_392# a_835_98# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1029 VPWR a_1747_74# a_2513_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1030 a_1367_93# a_1234_119# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Q a_2513_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1032 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 a_1034_392# a_835_98# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1034 VPWR a_1367_93# a_1332_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1234_119# a_835_98# a_409_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND RESET_B a_225_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_338_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_409_81# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1234_119# a_1034_392# a_409_81# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1367_93# a_1234_119# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_1747_74# a_2008_48# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_409_81# a_27_74# a_512_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_512_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_835_98# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_1747_74# a_1034_392# a_1969_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR a_1747_74# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_409_81# a_835_98# a_1234_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_2513_424# a_1747_74# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 VGND a_1234_119# a_1367_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_2124_74# a_1747_74# a_2008_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_312_81# D a_409_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_835_98# a_1034_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_225_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_1234_119# a_1367_93# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_2008_48# a_1747_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VPWR RESET_B a_1234_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VGND a_835_98# a_1034_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_1234_119# a_835_98# a_1332_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_225_81# a_27_74# a_312_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_2513_424# a_1747_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X19 a_1969_489# a_2008_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VGND RESET_B a_2124_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_338_464# D a_409_81# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_1367_93# a_1034_392# a_1747_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 VGND a_2513_424# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_1367_93# a_835_98# a_1747_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VGND a_1747_74# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 VPWR RESET_B a_409_81# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 a_1320_119# a_1367_93# a_1397_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_409_81# SCE a_545_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR a_2513_424# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X32 VPWR RESET_B a_2008_48# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_1747_74# a_835_98# a_1966_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1332_457# a_1367_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 a_835_98# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 a_1234_119# a_1034_392# a_1320_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VPWR SCE a_338_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X38 a_409_81# a_1034_392# a_1234_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 a_545_81# SCD a_225_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_1397_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_1966_74# a_2008_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.cdl b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.cdl
index 0d7911f..b2a66ad 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_ls__sdfrbp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O Q_N:O
-MI642 clkneg CLK VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK 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
-MI651 Q_N s0 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net92 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net126 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI33 net119 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI651 Q_N s0 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
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net107 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net195 s0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net195 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
-MI654 net102 net92 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net92 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net126 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net119 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net107 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net195 s0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net195 VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net102 net92 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net146 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net146 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net223 net92 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net92 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI662 net223 net92 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net92 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net92 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net202 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net195 s0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net195 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N s0 VPB 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
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net92 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net202 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net195 s0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net195 VPB 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
-MI661 Q_N s0 VPB 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
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfrbp_2
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.netlist.tsv
index 151269e..3db2867 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ls__sdfrbp_2	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
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	s0	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net92	s0	net126	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net126	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net119	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net107	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net107	M1	net119	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net195	s0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net195	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net102	net92	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net146	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net146	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net146	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net223	net92	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net92	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net223	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net92	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net202	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net202	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net195	s0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net195	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net92	s0	net126	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net126	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net119	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net107	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net107	M1	net119	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net195	s0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net195	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net102	net92	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net146	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net146	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net146	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net223	net92	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net92	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net223	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net92	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net202	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net202	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net195	s0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net195	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.spice b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.spice
index fa702a7..edacccd 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.spice
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_ls__sdfrbp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VGND RESET_B a_223_79# VNB nshort w=420000u l=150000u
-+  ad=2.20027e+12p pd=1.854e+07u as=2.751e+11p ps=2.99e+06u
-M1001 VPWR a_2006_373# a_1955_471# VPB phighvt w=420000u l=150000u
-+  ad=3.4219e+12p pd=2.674e+07u as=1.134e+11p ps=1.38e+06u
-M1002 a_1370_290# a_1223_119# VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1003 VPWR a_1790_75# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1004 a_1790_75# a_852_119# a_1370_290# VPB phighvt w=1e+06u l=150000u
-+  ad=4.029e+11p pd=3.28e+06u as=3e+11p ps=2.6e+06u
-M1005 a_2604_392# a_1790_75# VGND VNB nshort w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1006 VGND RESET_B a_1401_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_310_79# a_27_79# a_223_79# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 a_223_79# SCD a_547_79# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 a_2006_373# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1010 a_1223_119# a_852_119# a_388_79# VNB nshort w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=3.906e+11p ps=3.54e+06u
-M1011 a_1323_119# a_1025_119# a_1223_119# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1012 a_2604_392# a_1790_75# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1013 a_2006_373# a_1790_75# a_2158_74# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1014 a_538_464# a_27_79# a_388_79# VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=6.808e+11p ps=5.72e+06u
-M1015 a_1223_119# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.436e+11p pd=2.84e+06u as=0p ps=0u
-M1016 a_1790_75# a_1025_119# a_1370_290# VNB nshort w=640000u l=150000u
-+  ad=4.3185e+11p pd=3.09e+06u as=0p ps=0u
-M1017 Q a_2604_392# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1018 a_388_79# D a_307_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1019 VGND CLK a_852_119# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.018e+11p ps=2.05e+06u
-M1020 a_2158_74# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Q_N a_1790_75# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1022 a_1325_457# a_852_119# a_1223_119# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1023 a_388_79# D a_310_79# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1955_471# a_1025_119# a_1790_75# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1790_75# a_2006_373# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR SCE a_27_79# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1027 VGND SCE a_27_79# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1028 a_547_79# SCE a_388_79# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1025_119# a_852_119# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1030 a_307_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR SCD a_538_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR CLK a_852_119# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1033 a_1223_119# a_1025_119# a_388_79# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Q a_2604_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1035 a_1025_119# a_852_119# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1036 Q_N a_1790_75# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_1790_75# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_2604_392# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1370_290# a_1223_119# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1401_119# a_1370_290# a_1323_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND a_2006_373# a_2000_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1042 VPWR a_1370_290# a_1325_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_2604_392# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_388_79# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2000_74# a_852_119# a_1790_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_2000_74# a_2006_373# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR SCE a_307_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_538_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_852_119# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_223_79# a_27_79# a_310_79# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_2604_392# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VGND a_2604_392# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_388_79# a_852_119# a_1223_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Q a_2604_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_1223_119# a_1370_290# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 Q_N a_1790_75# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR a_852_119# a_1025_119# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_1370_290# a_1025_119# a_1790_75# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_307_464# D a_388_79# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_1223_119# a_852_119# a_1325_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_1401_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_27_79# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_388_79# a_1025_119# a_1223_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_1223_119# a_1025_119# a_1323_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND RESET_B a_2158_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_2006_373# a_1790_75# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VGND a_1790_75# a_2604_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_388_79# SCE a_547_79# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_388_79# a_27_79# a_538_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 Q_N a_1790_75# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 a_27_79# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VPWR RESET_B a_1223_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 a_547_79# SCD a_223_79# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VGND a_1790_75# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VPWR a_1223_119# a_1370_290# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X30 Q a_2604_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_1323_119# a_1370_290# a_1401_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1955_471# a_2006_373# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_2158_74# a_1790_75# a_2006_373# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VPWR RESET_B a_388_79# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 VGND a_852_119# a_1025_119# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 a_1325_457# a_1370_290# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 VPWR RESET_B a_2006_373# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X38 VPWR a_1790_75# a_2604_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X39 a_1790_75# a_1025_119# a_1955_471# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X40 a_1790_75# a_852_119# a_2000_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_223_79# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_852_119# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X43 a_1370_290# a_852_119# a_1790_75# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X44 a_310_79# D a_388_79# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 VPWR a_1790_75# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.cdl b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.cdl
index d90d16b..8c5bebe 100644
--- a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.cdl
+++ b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ls__sdfrtn_1 CLK_N D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkpos CLK_N VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkpos CLK_N 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net87 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net121 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net114 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net87 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net102 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net182 s0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net182 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
-MI654 net86 net87 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net121 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net102 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net182 s0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net182 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
+MI654 net86 net87 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net137 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net137 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkpos CLK_N VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg clkpos VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265
+MI643 clkpos CLK_N VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net210 net87 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net87 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI662 net210 net87 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net87 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net87 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net189 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net182 s0 VPB 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
+MI660 Q net182 VPB 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
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net87 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net189 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net182 s0 VPB 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
-MI660 Q net182 VPB 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
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfrtn_1
diff --git a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.netlist.tsv b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.netlist.tsv
index 2fb5531..a973126 100644
--- a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.netlist.tsv
+++ b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__sdfrtn_1	CLK_N: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
-MI642	MOSFET	clkpos	CLK_N	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net87	s0	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net121	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net114	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net102	M1	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net182	s0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net182	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net86	net87	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net137	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net210	net87	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net87	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net210	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net87	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net189	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net189	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net182	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net182	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkpos	CLK_N	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net87	s0	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net121	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net114	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net102	M1	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net182	s0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net182	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net86	net87	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net137	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkpos	CLK_N	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net210	net87	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net87	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net210	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net87	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net189	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net189	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net182	s0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net182	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.spice b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.spice
index 32176eb..d77751c 100644
--- a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.spice
+++ b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__sdfrtn_1 CLK_N D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR a_2087_410# a_2042_508# VPB phighvt w=420000u l=150000u
-+  ad=2.13575e+12p pd=1.79e+07u as=1.092e+11p ps=1.36e+06u
-M1001 VGND a_2087_410# a_2073_74# VNB nshort w=420000u l=150000u
-+  ad=1.77155e+12p pd=1.431e+07u as=1.05e+11p ps=1.34e+06u
-M1002 a_284_464# D a_206_464# VPB phighvt w=640000u l=150000u
-+  ad=8.151e+11p pd=6.15e+06u as=1.536e+11p ps=1.76e+06u
-M1003 a_538_81# SCE a_284_464# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.549e+11p ps=3.37e+06u
-M1004 a_1251_463# a_854_74# a_284_464# VPB phighvt w=420000u l=150000u
-+  ad=2.499e+11p pd=2.87e+06u as=0p ps=0u
-M1005 a_2087_410# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1006 Q a_2492_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1007 a_2265_74# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 a_2087_410# a_1827_144# a_2265_74# VNB nshort w=420000u l=150000u
-+  ad=2.1e+11p pd=1.84e+06u as=0p ps=0u
-M1009 a_1827_144# a_1049_347# a_1402_308# VPB phighvt w=1e+06u l=150000u
-+  ad=3.128e+11p pd=2.73e+06u as=7.85e+11p ps=3.57e+06u
-M1010 a_1049_347# a_854_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1011 VGND RESET_B a_1489_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1012 a_854_74# CLK_N VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1013 a_1251_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1411_123# a_854_74# a_1251_463# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.289e+11p ps=1.93e+06u
-M1015 Q a_2492_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1016 VPWR SCD a_471_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1017 VPWR a_1827_144# a_2087_410# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1341_463# a_1049_347# a_1251_463# VPB phighvt w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=0p ps=0u
-M1019 a_324_81# a_27_88# a_239_81# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1020 a_1402_308# a_1251_463# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2042_508# a_854_74# a_1827_144# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_284_464# D a_324_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1251_463# a_1049_347# a_284_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR CLK_N a_854_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=3.35e+11p ps=2.67e+06u
-M1025 VPWR a_1402_308# a_1341_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND RESET_B a_239_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_1827_144# a_2492_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
-M1028 a_1049_347# a_854_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.122e+11p pd=2.67e+06u as=0p ps=0u
-M1029 a_1489_123# a_1402_308# a_1411_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR SCE a_27_88# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1031 a_206_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2073_74# a_1049_347# a_1827_144# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=6.2565e+11p ps=4.26e+06u
-M1033 VGND a_1827_144# a_2492_424# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1034 a_239_81# SCD a_538_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_471_464# a_27_88# a_284_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1402_308# a_1251_463# VGND VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=2.4e+06u as=0p ps=0u
-M1037 VGND SCE a_27_88# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1038 a_1827_144# a_854_74# a_1402_308# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_284_464# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1341_463# a_1402_308# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_284_464# a_854_74# a_1251_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1251_463# a_854_74# a_1411_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_2492_424# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_284_464# SCE a_538_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_471_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_1827_144# a_854_74# a_2042_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_324_81# D a_284_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_538_81# SCD a_239_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_1251_463# a_1402_308# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_2492_424# a_1827_144# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 VPWR a_2492_424# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_2265_74# a_1827_144# a_2087_410# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR RESET_B a_2087_410# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_206_464# D a_284_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 a_1402_308# a_854_74# a_1827_144# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_27_88# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 VPWR RESET_B a_284_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_1402_308# a_1049_347# a_1827_144# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_2042_508# a_2087_410# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_27_88# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1251_463# a_1049_347# a_1341_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_239_81# a_27_88# a_324_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_854_74# a_1049_347# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 a_2492_424# a_1827_144# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X25 a_239_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND CLK_N a_854_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 VGND RESET_B a_2265_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1827_144# a_1049_347# a_2073_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_854_74# CLK_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X30 a_1411_123# a_1402_308# a_1489_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_2073_74# a_2087_410# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VPWR SCE a_206_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 a_2087_410# a_1827_144# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 a_284_464# a_27_88# a_471_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 VGND a_1251_463# a_1402_308# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X36 VPWR a_854_74# a_1049_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X37 VPWR RESET_B a_1251_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X38 a_284_464# a_1049_347# a_1251_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1489_123# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.cdl b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.cdl
index ad863c7..8cdadb6 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ls__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net87 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net121 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI33 net114 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net102 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net174 s0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net174 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
-MI654 net97 net87 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net87 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net121 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net102 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net174 s0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net174 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
+MI654 net97 net87 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net137 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net137 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net202 net87 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net87 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI662 net202 net87 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net87 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net87 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net181 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net174 s0 VPB 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
+MI660 Q net174 VPB 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
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net87 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net181 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net174 s0 VPB 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
-MI660 Q net174 VPB 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
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfrtp_1
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.netlist.tsv
index c5ca633..c80894e 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__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
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net87	s0	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net121	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net114	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net102	M1	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net97	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net174	s0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net174	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net97	net87	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net137	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net202	net87	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net87	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net202	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net87	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net181	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net181	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net174	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net174	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net87	s0	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net121	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net114	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net102	M1	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net97	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net174	s0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net174	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net97	net87	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net137	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net202	net87	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net87	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net202	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net87	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net181	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net181	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net174	s0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net174	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.spice b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.spice
index 6d2d278..b01091a 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.spice
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1320_119# a_1034_392# a_1234_119# VNB nshort w=420000u l=150000u
-+  ad=9.87e+10p pd=1.31e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VGND a_1997_272# a_1972_74# VNB nshort w=420000u l=150000u
-+  ad=1.59428e+12p pd=1.37e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_1972_74# a_835_98# a_1745_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.687e+11p ps=3.25e+06u
-M1003 a_1745_74# a_1034_392# a_1367_93# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1004 Q a_2399_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 a_312_81# a_27_88# a_225_81# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.499e+11p ps=2.87e+06u
-M1006 a_300_464# D a_312_81# VNB nshort w=420000u l=150000u
-+  ad=3.738e+11p pd=3.46e+06u as=0p ps=0u
-M1007 VGND RESET_B a_1397_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 VPWR a_1367_93# a_1343_461# VPB phighvt w=420000u l=150000u
-+  ad=2.19608e+12p pd=1.864e+07u as=1.134e+11p ps=1.38e+06u
-M1009 a_1234_119# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.765e+11p pd=3.02e+06u as=0p ps=0u
-M1010 a_2399_424# a_1745_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1011 a_300_464# D a_216_464# VPB phighvt w=640000u l=150000u
-+  ad=9.687e+11p pd=6.63e+06u as=1.728e+11p ps=1.82e+06u
-M1012 a_225_81# SCD a_545_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1013 a_1367_93# a_1234_119# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1014 a_1993_508# a_1034_392# a_1745_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.42975e+11p ps=3.64e+06u
-M1015 Q a_2399_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1016 a_1997_272# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1017 a_216_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1745_74# a_835_98# a_1367_93# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1397_119# a_1367_93# a_1320_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR SCE a_27_88# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1021 a_1997_272# a_1745_74# a_2135_74# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1022 a_535_464# a_27_88# a_300_464# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1023 VPWR a_1745_74# a_1997_272# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_545_81# SCE a_300_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_2399_424# a_1745_74# VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1026 VPWR SCD a_535_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR CLK a_835_98# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1028 VGND CLK a_835_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.619e+11p ps=2.38e+06u
-M1029 a_1343_461# a_835_98# a_1234_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1034_392# a_835_98# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1031 a_1367_93# a_1234_119# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1034_392# a_835_98# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1033 VGND SCE a_27_88# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1034 VPWR a_1997_272# a_1993_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1234_119# a_835_98# a_300_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_2135_74# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND RESET_B a_225_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_300_464# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1234_119# a_1034_392# a_300_464# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_312_81# D a_300_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_535_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_835_98# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VPWR a_1234_119# a_1367_93# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_1745_74# a_1034_392# a_1993_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_300_464# a_835_98# a_1234_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_1234_119# a_1367_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VPWR RESET_B a_1234_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_835_98# a_1034_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_225_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1367_93# a_1034_392# a_1745_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_300_464# a_27_88# a_535_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VGND a_2399_424# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VGND a_1745_74# a_2399_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X14 VGND a_835_98# a_1034_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR RESET_B a_1997_272# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_1343_461# a_1367_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_225_81# a_27_88# a_312_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_27_88# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_1367_93# a_835_98# a_1745_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 a_27_88# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR SCE a_216_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VPWR a_2399_424# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 VGND RESET_B a_2135_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_2135_74# a_1745_74# a_1997_272# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_216_464# D a_300_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VPWR RESET_B a_300_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_1997_272# a_1745_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_1320_119# a_1367_93# a_1397_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1993_508# a_1997_272# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_300_464# SCE a_545_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1745_74# a_835_98# a_1972_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_835_98# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 a_1234_119# a_1034_392# a_1320_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_300_464# a_1034_392# a_1234_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 a_545_81# SCD a_225_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_1234_119# a_835_98# a_1343_461# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 VPWR a_1745_74# a_2399_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X38 a_1397_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1972_74# a_1997_272# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.cdl b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.cdl
index 98865b3..0262814 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ls__sdfrtp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net87 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net121 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI33 net114 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net102 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net182 s0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net182 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
-MI654 net97 net87 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net87 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net121 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net102 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net182 s0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net182 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
+MI654 net97 net87 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net137 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 M1 clkpos 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
+MI666 net137 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net210 net87 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net87 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI662 net210 net87 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net87 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net87 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net189 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net182 s0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net182 VPB 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
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net87 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net189 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net182 s0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net182 VPB 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
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfrtp_2
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.netlist.tsv
index a63f035..2425021 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__sdfrtp_2	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
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net87	s0	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net121	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net114	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net102	M1	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net97	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net182	s0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net182	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net97	net87	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net137	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net210	net87	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net87	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net210	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net87	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net189	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net189	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net182	s0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net182	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net87	s0	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net121	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net114	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net102	M1	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net97	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net182	s0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net182	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net97	net87	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net137	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net210	net87	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net87	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net210	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net87	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net189	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net189	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net182	s0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net182	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.spice b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.spice
index a5a8cc1..8324306 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.spice
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_ls__sdfrtp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1320_119# a_1034_392# a_1234_119# VNB nshort w=420000u l=150000u
-+  ad=9.87e+10p pd=1.31e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_1234_119# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.499e+11p pd=2.87e+06u as=3.0042e+12p ps=2.284e+07u
-M1002 a_2078_74# a_835_98# a_1824_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=5.504e+11p ps=3.72e+06u
-M1003 VGND a_2082_446# a_2078_74# VNB nshort w=420000u l=150000u
-+  ad=2.07625e+12p pd=1.687e+07u as=0p ps=0u
-M1004 a_390_81# D a_340_464# VPB phighvt w=640000u l=150000u
-+  ad=4.983e+11p pd=5.16e+06u as=1.728e+11p ps=1.82e+06u
-M1005 a_312_81# a_27_74# a_225_81# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.499e+11p ps=2.87e+06u
-M1006 a_390_81# D a_312_81# VNB nshort w=420000u l=150000u
-+  ad=3.738e+11p pd=3.46e+06u as=0p ps=0u
-M1007 a_2082_446# a_1824_74# a_2242_74# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1008 a_1332_457# a_835_98# a_1234_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VGND RESET_B a_1397_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 a_2492_392# a_1824_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1011 a_225_81# SCD a_545_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1012 Q a_2492_392# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1013 a_2082_446# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1014 a_2242_74# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1367_93# a_1234_119# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=4.9755e+11p pd=3.13e+06u as=0p ps=0u
-M1016 a_1824_74# a_1034_392# a_1367_93# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.627e+11p ps=2.19e+06u
-M1017 a_512_464# a_27_74# a_390_81# VPB phighvt w=640000u l=150000u
-+  ad=2.56e+11p pd=2.08e+06u as=0p ps=0u
-M1018 a_1824_74# a_835_98# a_1367_93# VPB phighvt w=1e+06u l=150000u
-+  ad=4.4725e+11p pd=3.66e+06u as=0p ps=0u
-M1019 a_1397_119# a_1367_93# a_1320_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_2492_392# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2492_392# a_1824_74# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1022 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1023 VGND a_2492_392# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1024 VPWR a_1824_74# a_2082_446# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_340_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_545_81# SCE a_390_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR SCD a_512_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR CLK a_835_98# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1029 VGND CLK a_835_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.619e+11p ps=2.38e+06u
-M1030 a_1034_392# a_835_98# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1031 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1032 a_1034_392# a_835_98# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1033 VPWR a_1367_93# a_1332_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1234_119# a_835_98# a_390_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1367_93# a_1234_119# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND RESET_B a_225_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_2037_508# a_1034_392# a_1824_74# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1038 VPWR a_2082_446# a_2037_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_390_81# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1234_119# a_1034_392# a_390_81# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Q a_2492_392# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_312_81# D a_390_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_2242_74# a_1824_74# a_2082_446# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_390_81# a_27_74# a_512_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_512_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_835_98# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_390_81# a_835_98# a_1234_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_2492_392# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 Q a_2492_392# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_835_98# a_1034_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_225_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_1234_119# a_1367_93# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_1824_74# a_835_98# a_2078_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR SCE a_340_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VPWR RESET_B a_1234_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VGND a_835_98# a_1034_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_2082_446# a_1824_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_1234_119# a_835_98# a_1332_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_225_81# a_27_74# a_312_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 VGND a_1234_119# a_1367_93# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 Q a_2492_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_340_464# D a_390_81# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_1824_74# a_1034_392# a_2037_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 VPWR RESET_B a_390_81# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_1367_93# a_835_98# a_1824_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X25 a_2037_508# a_2082_446# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_1320_119# a_1367_93# a_1397_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VPWR a_1824_74# a_2492_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X28 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_390_81# SCE a_545_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1332_457# a_1367_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_835_98# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X32 a_1234_119# a_1034_392# a_1320_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_2078_74# a_2082_446# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND a_2492_392# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 a_390_81# a_1034_392# a_1234_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 a_545_81# SCD a_225_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VPWR RESET_B a_2082_446# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X38 VGND RESET_B a_2242_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VGND a_1824_74# a_2492_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X40 a_1397_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_1367_93# a_1034_392# a_1824_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.cdl b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.cdl
index 7af6ca0..6d25e6f 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_ls__sdfrtp_4 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I
 *.PININFO Q:O
-MI642 clkneg CLK VNB 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK 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
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net87 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net121 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI33 net114 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net102 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 s0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net182 s0 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
-MI653 Q net182 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
-MI654 net86 net87 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net87 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 M1 M0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net121 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net114 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 M1 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net102 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net182 s0 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
+MI653 Q net182 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
+MI654 net86 net87 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net137 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net137 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 clkneg CLK VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=1 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net210 net87 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net87 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI662 net210 net87 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 net87 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 s0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net87 s0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net189 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 M0 RESET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net182 s0 VPB pfet_01v8_hvt m=2 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
+MI660 Q net182 VPB 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
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net87 s0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net189 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 M0 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net182 s0 VPB phighvt m=2 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
-MI660 Q net182 VPB phighvt 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
-MI648 M1 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 M1 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 db RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 db RESET_B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfrtp_4
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.netlist.tsv
index 96408c8..0e61911 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__sdfrtp_4	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
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net87	s0	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net121	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net114	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net102	M1	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net182	s0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net182	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net86	net87	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net137	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net210	net87	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net87	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net210	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net87	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net189	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net189	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net182	s0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net182	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net87	s0	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net121	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net114	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net102	M1	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net182	s0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net182	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net86	net87	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net137	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net210	net87	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net87	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net210	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net87	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net189	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net189	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net182	s0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net182	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.spice b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.spice
index 9b89f77..4f5612e 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.spice
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.spice
@@ -16,98 +16,51 @@
 
 
 .subckt sky130_fd_sc_ls__sdfrtp_4 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1236_138# a_1034_392# a_415_81# VPB phighvt w=420000u l=150000u
-+  ad=2.709e+11p pd=2.97e+06u as=5.047e+11p ps=5.18e+06u
-M1001 a_1236_138# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.41945e+12p ps=2.648e+07u
-M1002 a_415_81# D a_340_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1003 a_1745_74# a_1034_392# a_1367_112# VNB nshort w=640000u l=150000u
-+  ad=4.33e+11p pd=3.08e+06u as=2.33e+11p ps=2.13e+06u
-M1004 VPWR a_2339_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1005 a_312_81# a_27_74# a_225_81# VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=2.373e+11p ps=2.81e+06u
-M1006 a_415_81# D a_312_81# VNB nshort w=420000u l=150000u
-+  ad=3.78e+11p pd=3.48e+06u as=0p ps=0u
-M1007 VGND a_2339_74# Q VNB nshort w=740000u l=150000u
-+  ad=2.36135e+12p pd=1.755e+07u as=4.144e+11p ps=4.08e+06u
-M1008 a_1342_463# a_837_98# a_1236_138# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 VPWR a_1367_112# a_1342_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND CLK a_837_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.42325e+11p ps=2.38e+06u
-M1011 VGND a_1745_74# a_2339_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1012 VGND RESET_B a_225_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1034_392# a_837_98# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1014 a_514_464# a_27_74# a_415_81# VPB phighvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1015 a_2003_48# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.617e+11p pd=1.61e+06u as=0p ps=0u
-M1016 Q a_2339_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Q a_2339_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1982_508# a_1034_392# a_1745_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.28275e+11p ps=3.57e+06u
-M1019 a_1367_112# a_1236_138# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_2003_48# a_1745_74# a_2141_74# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=8.82e+10p ps=1.26e+06u
-M1021 VGND a_2003_48# a_1955_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1022 Q a_2339_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1024 VGND RESET_B a_1397_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 VPWR a_2339_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_340_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1955_74# a_837_98# a_1745_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_2339_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR SCD a_514_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR CLK a_837_98# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1031 a_1367_112# a_1236_138# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1032 a_1236_138# a_837_98# a_415_81# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1033 a_2339_74# a_1745_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1034 a_1034_392# a_837_98# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1035 VPWR a_1745_74# a_2003_48# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1037 a_572_81# SCE a_415_81# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1038 a_2141_74# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Q a_2339_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_225_81# SCD a_572_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1322_138# a_1034_392# a_1236_138# VNB nshort w=420000u l=150000u
-+  ad=9.45e+10p pd=1.29e+06u as=0p ps=0u
-M1042 a_1745_74# a_837_98# a_1367_112# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_2003_48# a_1982_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1397_138# a_1367_112# a_1322_138# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_415_81# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR a_1745_74# a_2339_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Q a_2339_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_514_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_837_98# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 VPWR a_2339_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_415_81# a_27_74# a_514_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_415_81# SCE a_572_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR RESET_B a_2003_48# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_312_81# D a_415_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_837_98# a_1034_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_1367_112# a_1034_392# a_1745_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_2339_74# a_1745_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 Q a_2339_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_1745_74# a_1034_392# a_1982_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_1367_112# a_837_98# a_1745_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 VPWR SCE a_340_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 VPWR RESET_B a_1236_138# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_415_81# a_1034_392# a_1236_138# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_1745_74# a_837_98# a_1955_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_225_81# a_27_74# a_312_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 Q a_2339_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_1955_74# a_2003_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1236_138# a_1034_392# a_1322_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_837_98# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 Q a_2339_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X25 VGND RESET_B a_2141_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1236_138# a_837_98# a_1342_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 a_1342_463# a_1367_112# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_2141_74# a_1745_74# a_2003_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_340_464# D a_415_81# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_415_81# a_837_98# a_1236_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR RESET_B a_415_81# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 VPWR a_1745_74# a_2339_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X33 a_1322_138# a_1367_112# a_1397_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_572_81# SCD a_225_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VGND a_1236_138# a_1367_112# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_225_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 VPWR a_1236_138# a_1367_112# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X39 a_2339_74# a_1745_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X40 VGND a_837_98# a_1034_392# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X41 a_1982_508# a_2003_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X42 VPWR a_2339_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X43 VGND a_2339_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X44 a_2003_48# a_1745_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X45 a_1397_138# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 VGND a_2339_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.cdl b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.cdl
index f9cf54b..e642456 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_ls__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net159 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net138 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI669 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N S0 VPB 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net199 S0 VPB 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
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net199 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net98 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI27 net243 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net194 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net199 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
-MI644 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net215 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net159 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N S0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net138 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N S0 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net199 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net199 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net98 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI27 net243 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 clkpos clkneg 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
+MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net194 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net199 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
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net215 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 Q_N S0 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
-MI44 clkneg CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK 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
+MI652 net199 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net199 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net206 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net187 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net206 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net187 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfsbp_1
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.netlist.tsv
index a870cc3..8dcc8f1 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ls__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
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net159	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net159	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net138	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net138	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net199	S0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net199	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net98	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net98	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI27	MOSFET	net243	S1	net215	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net187	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net194	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net199	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net215	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net206	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net199	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net194	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net206	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net187	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net243	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net159	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net159	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net138	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net138	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net199	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net199	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net98	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net98	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI27	MOSFET	net243	S1	net215	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net187	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net194	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net199	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net215	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net206	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net199	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net194	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net206	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net187	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net243	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.spice b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.spice
index ec23e3b..a9d589a 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.spice
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_ls__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1876_74# a_594_74# a_1762_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.391e+11p ps=2.12e+06u
-M1001 a_1954_74# a_1924_48# a_1876_74# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1002 VGND a_1163_48# a_1115_74# VNB nshort w=420000u l=150000u
-+  ad=2.17215e+12p pd=1.688e+07u as=1.008e+11p ps=1.32e+06u
-M1003 a_1924_48# a_1762_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 a_1115_74# a_781_74# a_995_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.89e+11p ps=1.74e+06u
-M1005 Q_N a_1762_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1006 VPWR a_1924_48# a_1712_374# VPB phighvt w=420000u l=150000u
-+  ad=2.1112e+12p pd=1.868e+07u as=3.744e+11p ps=4.45e+06u
-M1007 VGND SET_B a_1954_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1600_347# a_995_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.8e+11p pd=5.16e+06u as=0p ps=0u
-M1009 a_1600_347# a_594_74# a_1762_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=4.393e+11p ps=4.2e+06u
-M1010 VGND SET_B a_1411_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 a_392_74# SCE a_290_464# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.0425e+11p ps=3.2e+06u
-M1012 VGND SCD a_392_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR SET_B a_1163_48# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.848e+11p ps=1.72e+06u
-M1014 a_290_464# D a_206_464# VPB phighvt w=640000u l=150000u
-+  ad=4.269e+11p pd=3.65e+06u as=1.728e+11p ps=1.82e+06u
-M1015 a_1762_74# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_1762_74# a_2556_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1017 a_995_74# a_781_74# a_290_464# VPB phighvt w=420000u l=150000u
-+  ad=2.11725e+11p pd=1.9e+06u as=0p ps=0u
-M1018 a_1133_478# a_594_74# a_995_74# VPB phighvt w=420000u l=150000u
-+  ad=1.674e+11p pd=1.73e+06u as=0p ps=0u
-M1019 VPWR CLK a_594_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.248e+11p ps=2.82e+06u
-M1020 a_781_74# a_594_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1021 Q a_2556_112# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.248e+11p pd=2.82e+06u as=0p ps=0u
-M1022 VGND CLK a_594_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1023 a_1684_74# a_995_74# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1024 a_1762_74# a_781_74# a_1684_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1163_48# a_1133_478# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1027 a_206_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Q a_2556_112# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1029 a_781_74# a_594_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1030 VPWR a_1762_74# a_2556_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.436e+11p ps=2.26e+06u
-M1031 VPWR SCD a_416_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1032 VPWR a_1762_74# a_1924_48# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1033 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1034 a_995_74# a_594_74# a_290_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1762_74# a_781_74# a_1712_374# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_228_74# a_27_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1037 a_290_464# D a_228_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q_N a_1762_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.248e+11p pd=2.82e+06u as=0p ps=0u
-M1039 a_416_464# a_27_74# a_290_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1163_48# a_995_74# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1411_74# a_995_74# a_1163_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_290_464# a_27_74# a_416_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_1762_74# a_594_74# a_1876_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_995_74# a_1684_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 VGND a_1762_74# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_228_74# D a_290_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_995_74# a_594_74# a_1133_478# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_290_464# SCE a_392_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_416_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_995_74# a_781_74# a_1115_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_1762_74# a_1924_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_2556_112# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_1954_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1411_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR a_594_74# a_781_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VPWR a_995_74# a_1600_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_2556_112# a_1762_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_2556_112# a_1762_74# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X17 a_290_464# a_594_74# a_995_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VGND a_594_74# a_781_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_290_464# a_781_74# a_995_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VPWR SET_B a_1762_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_1163_48# a_995_74# a_1411_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR a_2556_112# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 VGND a_27_74# a_228_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_594_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_1876_74# a_1924_48# a_1954_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_1163_48# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_1762_74# a_594_74# a_1600_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 a_1684_74# a_781_74# a_1762_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 VPWR a_1762_74# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X31 a_392_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1712_374# a_781_74# a_1762_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 VPWR SCE a_206_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X34 a_1115_74# a_1163_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_594_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 a_1133_478# a_1163_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_1924_48# a_1762_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 a_1712_374# a_1924_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X40 a_206_464# D a_290_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X41 VPWR a_995_74# a_1163_48# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.cdl b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.cdl
index 0b93332..487a7f6 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_ls__sdfsbp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net195 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net195 VPB 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net130 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net122 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=2 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
-MI37 net107 M0 VPB phighvt m=2 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
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI661 Q_N S0 VPB 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
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI34 S0 clkpos VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net239 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net230 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net242 M0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net199 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net195 S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net187 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net195 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net195 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net195 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net130 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=2 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
+MI37 net107 M0 VPB pfet_01v8_hvt m=2 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
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N S0 VPB 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
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI34 S0 clkpos VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net239 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N S0 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net230 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net242 M0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net199 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net195 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net187 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net195 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
+MI651 Q_N S0 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
 .ENDS sky130_fd_sc_ls__sdfsbp_2
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.netlist.tsv
index 3047efe..37d10c8 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ls__sdfsbp_2	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
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net195	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net195	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net130	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net130	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net107	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net107	M0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI34	MOSFET	S0	clkpos	net242	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net239	S1	net187	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net230	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net199	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net230	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net242	M0	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net239	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net199	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net195	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net187	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net195	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	S0	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net195	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net195	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net130	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net130	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net107	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net107	M0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI34	MOSFET	S0	clkpos	net242	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net239	S1	net187	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net230	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net199	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net230	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net242	M0	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net239	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net199	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net195	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net187	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net195	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.spice b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.spice
index 9af442a..34c2d58 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.spice
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.spice
@@ -16,104 +16,54 @@
 
 
 .subckt sky130_fd_sc_ls__sdfsbp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 Q_N a_2067_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=3.668e+12p ps=2.764e+07u
-M1001 VGND a_1069_81# a_1794_74# VNB nshort w=640000u l=150000u
-+  ad=2.2419e+12p pd=2.069e+07u as=6.208e+11p ps=5.78e+06u
-M1002 a_1789_424# a_1069_81# VPWR VPB phighvt w=840000u l=150000u
-+  ad=7.896e+11p pd=6.92e+06u as=0p ps=0u
-M1003 VPWR a_2513_258# a_2277_455# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.499e+11p ps=2.87e+06u
-M1004 VPWR a_2067_74# a_3177_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.95e+11p ps=2.59e+06u
-M1005 a_1789_424# a_619_368# a_2067_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.998e+11p ps=5.14e+06u
-M1006 a_220_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1007 a_2501_74# a_619_368# a_2067_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=5.999e+11p ps=4.61e+06u
-M1008 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1009 a_1794_74# a_1069_81# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_2067_74# a_3177_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1011 Q a_3177_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1012 a_1567_74# a_1069_81# a_1252_376# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1013 VGND SET_B a_1567_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_2067_74# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_871_74# a_619_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.696e+11p pd=2.9e+06u as=0p ps=0u
-M1016 a_1252_376# a_1069_81# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.68e+11p pd=1.64e+06u as=0p ps=0u
-M1017 a_495_74# SCE a_304_464# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=4.515e+11p ps=3.83e+06u
-M1018 VGND SCD a_495_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1069_81# a_619_368# a_304_464# VNB nshort w=420000u l=150000u
-+  ad=3.675e+11p pd=2.59e+06u as=0p ps=0u
-M1020 a_2579_74# a_2513_258# a_2501_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1021 VGND SET_B a_2579_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Q_N a_2067_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.22e+11p pd=2.08e+06u as=0p ps=0u
-M1023 Q a_3177_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1024 VGND a_1252_376# a_1274_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 VGND a_2067_74# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR CLK a_619_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1027 a_1274_81# a_871_74# a_1069_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_3177_368# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR SET_B a_1252_376# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR SCD a_418_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1031 a_1069_81# a_871_74# a_304_464# VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=3.927e+11p ps=3.55e+06u
-M1032 a_1794_74# a_871_74# a_2067_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_871_74# a_619_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1034 VPWR a_1252_376# a_1201_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1035 a_229_74# a_27_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1036 a_304_464# D a_229_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_2067_74# a_871_74# a_1794_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_2513_258# a_2067_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1039 VGND CLK a_619_368# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1040 a_1201_463# a_619_368# a_1069_81# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_2067_74# a_2513_258# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.239e+11p ps=1.43e+06u
-M1042 a_418_464# a_27_74# a_304_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_1069_81# a_1789_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1045 VPWR a_2067_74# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_2067_74# a_619_368# a_1789_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_2067_74# a_871_74# a_2277_455# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_304_464# D a_220_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND a_3177_368# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_2067_74# a_2513_258# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR SCE a_220_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_619_368# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND a_3177_368# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_304_464# a_27_74# a_418_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_1794_74# a_1069_81# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_3177_368# a_2067_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VPWR a_3177_368# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND a_27_74# a_229_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_619_368# a_871_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_3177_368# a_2067_74# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_1789_424# a_1069_81# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_304_464# a_619_368# a_1069_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_418_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 VPWR SET_B a_2067_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR a_2067_74# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_2501_74# a_2513_258# a_2579_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 Q a_3177_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND a_2067_74# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_2067_74# a_619_368# a_1789_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_2067_74# a_871_74# a_1794_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VPWR a_1069_81# a_1252_376# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_1252_376# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_2277_455# a_871_74# a_2067_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_2513_258# a_2067_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_2067_74# a_619_368# a_2501_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_304_464# a_871_74# a_1069_81# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 a_1274_81# a_1252_376# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_619_368# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 a_1567_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1201_463# a_1252_376# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_495_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 Q_N a_2067_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 Q a_3177_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X34 VPWR a_1069_81# a_1789_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X35 a_1069_81# a_619_368# a_1201_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 Q_N a_2067_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 a_1794_74# a_871_74# a_2067_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 a_229_74# D a_304_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_2277_455# a_2513_258# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X41 a_1069_81# a_871_74# a_1274_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_1252_376# a_1069_81# a_1567_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X44 a_220_464# D a_304_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X45 a_304_464# SCE a_495_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 a_1789_424# a_619_368# a_2067_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X47 VGND a_1069_81# a_1794_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X48 a_2579_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X49 VPWR a_619_368# a_871_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.cdl b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.cdl
index 8061cf2..0c59a37 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.cdl
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_ls__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 VPB 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
-MI660 Q net165 VPB 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net104 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net96 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 net84 M0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net209 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net200 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net212 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI657 net169 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg VPB 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
-MI652 net165 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net157 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net165 S0 VPB 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
-MI653 Q net165 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB 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
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net104 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net84 M0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net209 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net200 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net212 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net169 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net165 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net165 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_ls__sdfstp_1
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.netlist.tsv b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.netlist.tsv
index 6133a9b..f25d375 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__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
-MI645	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net104	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net104	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net96	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net96	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net84	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net212	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net209	S1	net157	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net200	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net169	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net200	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net212	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net209	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net169	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net165	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net157	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net165	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net165	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net165	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net104	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net104	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net96	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net96	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net84	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net84	M0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net212	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net209	S1	net157	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net200	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net169	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net200	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net212	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net209	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net169	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net165	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net157	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net165	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.spice b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.spice
index a43646b..3b9c8d5 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.spice
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 VGND SCD a_402_74# VNB nshort w=420000u l=150000u
-+  ad=1.66425e+12p pd=1.358e+07u as=1.008e+11p ps=1.32e+06u
-M1001 a_238_74# a_27_464# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1002 a_402_74# SCE a_289_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.373e+11p ps=2.81e+06u
-M1003 VGND CLK a_599_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1004 VPWR a_1764_74# a_2395_112# VPB phighvt w=840000u l=150000u
-+  ad=2.1476e+12p pd=1.857e+07u as=2.394e+11p ps=2.25e+06u
-M1005 a_415_464# a_27_464# a_289_464# VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=4.311e+11p ps=3.67e+06u
-M1006 a_1988_74# a_1958_48# a_1910_74# VNB nshort w=420000u l=150000u
-+  ad=3.192e+11p pd=2.36e+06u as=1.008e+11p ps=1.32e+06u
-M1007 VPWR a_1198_55# a_1128_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.533e+11p ps=1.57e+06u
-M1008 a_1610_341# a_998_81# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.65e+11p pd=5.13e+06u as=0p ps=0u
-M1009 VPWR a_1958_48# a_1721_374# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.781e+11p ps=4.48e+06u
-M1010 VGND a_1198_55# a_1150_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 VPWR SET_B a_1198_55# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1012 a_1150_81# a_800_74# a_998_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.562e+11p ps=2.06e+06u
-M1013 VGND SET_B a_1426_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1014 a_998_81# a_599_74# a_289_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_800_74# a_599_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1016 a_1764_74# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=4.456e+11p pd=4.23e+06u as=0p ps=0u
-M1017 VPWR CLK a_599_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1018 VGND SET_B a_1988_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Q a_2395_112# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1020 VGND SCE a_27_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1021 a_289_464# D a_205_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1022 a_1198_55# a_998_81# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1426_118# a_998_81# a_1198_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1024 a_800_74# a_599_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.076e+11p pd=2.83e+06u as=0p ps=0u
-M1025 a_289_464# D a_238_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR SCE a_27_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.856e+11p ps=1.86e+06u
-M1027 a_205_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Q a_2395_112# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1029 VGND a_1764_74# a_2395_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=3.85e+11p ps=2.5e+06u
-M1030 a_998_81# a_800_74# a_289_464# VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=0p ps=0u
-M1031 a_1910_74# a_599_74# a_1764_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.547e+11p ps=2.44e+06u
-M1032 a_1128_457# a_599_74# a_998_81# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1958_48# a_1764_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1034 VPWR a_1764_74# a_1958_48# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1035 VPWR SCD a_415_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1764_74# a_800_74# a_1721_374# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1610_341# a_599_74# a_1764_74# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1686_74# a_998_81# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1039 a_1764_74# a_800_74# a_1686_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1764_74# a_599_74# a_1910_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_2395_112# a_1764_74# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 a_1150_81# a_1198_55# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1128_457# a_1198_55# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_1686_74# a_800_74# a_1764_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR a_998_81# a_1610_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 VPWR SET_B a_1764_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_2395_112# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_599_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_599_74# a_800_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR a_599_74# a_800_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_1988_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_2395_112# a_1764_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_27_464# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_1721_374# a_800_74# a_1764_74# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_1958_48# a_1764_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_1198_55# a_998_81# a_1426_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_998_81# a_1686_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_27_464# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_402_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1764_74# a_599_74# a_1610_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 VGND a_1764_74# a_1958_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_205_464# D a_289_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_1721_374# a_1958_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_289_464# a_599_74# a_998_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_1426_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR SCE a_205_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_998_81# a_800_74# a_1150_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_2395_112# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 VPWR a_998_81# a_1198_55# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_1198_55# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_415_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 a_599_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 VGND a_27_464# a_238_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1910_74# a_1958_48# a_1988_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_998_81# a_599_74# a_1128_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 a_238_74# D a_289_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_289_464# a_27_464# a_415_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X38 a_289_464# SCE a_402_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_289_464# a_800_74# a_998_81# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.cdl b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.cdl
index fa97084..99caa2c 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.cdl
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_ls__sdfstp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net165 VPB 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net109 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net96 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=2 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
-MI37 net84 M0 VPB phighvt m=2 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
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net209 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net200 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net212 M0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI657 net196 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg VPB 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
-MI652 net165 S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net157 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net165 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net165 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB 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
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net109 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=2 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
+MI37 net84 M0 VPB pfet_01v8_hvt m=2 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
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net209 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net200 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net212 M0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net196 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net165 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net165 VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_ls__sdfstp_2
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.netlist.tsv b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.netlist.tsv
index 3edf3e5..747601b 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__sdfstp_2	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
-MI645	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net109	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net109	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net96	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net96	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net84	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net212	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net209	S1	net157	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net200	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net196	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net200	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net212	M0	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net209	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net196	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net165	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net157	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net165	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net165	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net165	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net109	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net109	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net96	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net96	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net84	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net84	M0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net212	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net209	S1	net157	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net200	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net196	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net200	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net212	M0	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net209	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net196	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net165	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net157	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net165	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.spice b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.spice
index b30ae18..a15f802 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.spice
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_ls__sdfstp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 a_795_74# a_608_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=2.0955e+12p ps=1.834e+07u
-M1001 a_1804_424# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=7.665e+11p pd=6.63e+06u as=2.54e+12p ps=2.247e+07u
-M1002 VGND CLK a_608_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1003 Q a_2611_98# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1004 a_795_74# a_608_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.076e+11p pd=2.83e+06u as=0p ps=0u
-M1005 a_1584_379# a_608_74# a_1804_424# VPB phighvt w=840000u l=150000u
-+  ad=5.04e+11p pd=4.56e+06u as=0p ps=0u
-M1006 VGND a_1185_55# a_1143_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 VGND a_1804_424# a_2611_98# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1008 a_991_81# a_608_74# a_290_464# VNB nshort w=420000u l=150000u
-+  ad=2.562e+11p pd=2.06e+06u as=2.352e+11p ps=2.8e+06u
-M1009 VGND SET_B a_2219_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1010 a_290_464# D a_206_464# VPB phighvt w=640000u l=150000u
-+  ad=4.311e+11p pd=3.67e+06u as=1.728e+11p ps=1.82e+06u
-M1011 a_1429_74# a_991_81# a_1185_55# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1012 VGND SET_B a_1429_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_290_464# D a_239_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1014 a_1641_74# a_991_81# VGND VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1015 a_2186_367# a_1804_424# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1016 a_1804_424# a_608_74# a_1584_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1117_483# a_608_74# a_991_81# VPB phighvt w=420000u l=150000u
-+  ad=1.714e+11p pd=1.78e+06u as=1.8445e+11p ps=1.87e+06u
-M1018 a_1584_379# a_991_81# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_991_81# a_795_74# a_290_464# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1143_81# a_795_74# a_991_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1022 a_206_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1185_55# a_991_81# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.449e+11p pd=1.53e+06u as=0p ps=0u
-M1024 a_2141_508# a_795_74# a_1804_424# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1025 VGND a_991_81# a_1641_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND SCD a_403_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1027 VPWR a_991_81# a_1584_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1641_74# a_795_74# a_1804_424# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.292e+11p ps=3.97e+06u
-M1029 VGND a_2611_98# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1185_55# a_1117_483# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_239_74# a_27_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_403_74# SCE a_290_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q a_2611_98# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1034 VPWR SCD a_416_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1035 VPWR a_2186_367# a_2141_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_1804_424# a_2186_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1037 VPWR a_1804_424# a_2611_98# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1038 a_2219_74# a_2186_367# a_2141_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1039 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1040 a_2141_74# a_608_74# a_1804_424# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR SET_B a_1185_55# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1804_424# a_795_74# a_1641_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_2611_98# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_416_464# a_27_74# a_290_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR CLK a_608_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.192e+11p ps=2.81e+06u
+X0 a_290_464# a_27_74# a_416_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_1584_379# a_991_81# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_991_81# a_795_74# a_1143_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_2611_98# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 Q a_2611_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_1143_81# a_1185_55# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_416_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_2141_508# a_2186_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_1117_483# a_1185_55# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_608_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_403_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_2611_98# a_1804_424# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_1804_424# a_795_74# a_1641_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_1804_424# a_795_74# a_2141_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_1641_74# a_991_81# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 a_1429_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_2219_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VGND a_27_74# a_239_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1804_424# a_608_74# a_1584_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 Q a_2611_98# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_608_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 VPWR a_991_81# a_1584_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 a_1804_424# a_608_74# a_2141_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_239_74# D a_290_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VPWR a_991_81# a_1185_55# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_290_464# SCE a_403_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VPWR SET_B a_1804_424# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 VGND a_991_81# a_1641_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X29 VGND a_1804_424# a_2186_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_290_464# a_608_74# a_991_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR SCE a_206_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 a_1185_55# a_991_81# a_1429_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 VGND a_2611_98# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 a_290_464# a_795_74# a_991_81# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 a_1185_55# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_1641_74# a_795_74# a_1804_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 a_2141_74# a_2186_367# a_2219_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_991_81# a_608_74# a_1117_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X40 a_2186_367# a_1804_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X41 a_2611_98# a_1804_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X42 a_206_464# D a_290_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X43 VGND a_608_74# a_795_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X44 a_1584_379# a_608_74# a_1804_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X45 VPWR a_608_74# a_795_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.cdl b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.cdl
index 1c4642c..c0d6669 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.cdl
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_ls__sdfstp_4 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI645 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 M1 M0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI645 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net165 S0 VPB phighvt m=2 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
-MI660 Q net165 VPB phighvt 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
-MI659 M1 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net109 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net96 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 S1 S0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 S0 clkneg VPB phighvt m=2 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
-MI37 net84 M0 VPB phighvt m=2 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
-MI43 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB 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
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 S0 clkpos VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net209 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 S1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI655 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net200 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net189 M0 VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB 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
-MI657 net169 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg VPB 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
-MI652 net165 S0 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
-MI644 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net157 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net165 S0 VPB pfet_01v8_hvt m=2 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
-MI653 Q net165 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB 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
+MI659 M1 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net109 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net96 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI669 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 S0 SET_B VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 S1 S0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=2 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
+MI37 net84 M0 VPB pfet_01v8_hvt m=2 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
+MI43 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 S0 clkpos VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net209 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 S1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 M1 M0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net200 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 net189 M0 VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net169 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net165 S0 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net165 VNB nfet_01v8 m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
 .ENDS sky130_fd_sc_ls__sdfstp_4
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.netlist.tsv b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.netlist.tsv
index b4e9137..795e8a5 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_ls__sdfstp_4	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
-MI645	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net109	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net109	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net96	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net96	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net84	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net189	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net209	S1	net157	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net200	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net169	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net200	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net189	M0	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net209	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net169	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net165	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net157	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net165	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net165	S0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net165	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net109	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net109	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net96	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net96	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net84	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net84	M0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net189	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net209	S1	net157	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net200	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net169	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net200	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net189	M0	VGND	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net209	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net169	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net165	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net157	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net165	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.spice b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.spice
index a932ea7..50ea5f4 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.spice
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.spice
@@ -16,106 +16,55 @@
 
 
 .subckt sky130_fd_sc_ls__sdfstp_4 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 Q a_2580_74# VGND VNB nshort w=740000u l=150000u
-+  ad=5.291e+11p pd=4.39e+06u as=2.27325e+12p ps=1.996e+07u
-M1001 VPWR SCD a_414_464# VPB phighvt w=640000u l=150000u
-+  ad=3.1281e+12p pd=2.706e+07u as=1.728e+11p ps=1.82e+06u
-M1002 a_1017_81# a_616_74# a_288_464# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=3.592e+11p ps=3.44e+06u
-M1003 VGND SET_B a_1445_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1004 VPWR a_1201_55# a_1140_495# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.8235e+11p ps=1.93e+06u
-M1005 a_1823_524# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=6.171e+11p pd=6.09e+06u as=0p ps=0u
-M1006 VPWR SET_B a_1201_55# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1007 a_2227_74# a_2191_180# a_2149_74# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.008e+11p ps=1.32e+06u
-M1008 VGND a_1823_524# a_2580_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1009 a_2103_508# a_803_74# a_1823_524# VPB phighvt w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1010 a_1823_524# a_803_74# a_1677_74# VNB nshort w=640000u l=150000u
-+  ad=3.963e+11p pd=3.85e+06u as=3.584e+11p ps=3.68e+06u
-M1011 Q a_2580_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=0p ps=0u
-M1012 a_414_464# a_27_74# a_288_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.311e+11p ps=3.67e+06u
-M1013 VPWR a_1823_524# a_2191_180# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.239e+11p ps=1.43e+06u
-M1014 VGND a_1017_81# a_1677_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_2580_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1620_373# a_616_74# a_1823_524# VPB phighvt w=840000u l=150000u
-+  ad=5.04e+11p pd=4.56e+06u as=0p ps=0u
-M1017 a_417_74# SCE a_288_464# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 VGND SCD a_417_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_1201_55# a_1153_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1020 a_1153_81# a_803_74# a_1017_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_803_74# a_616_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1022 a_2580_74# a_1823_524# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1023 VGND a_2580_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1445_74# a_1017_81# a_1201_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1025 VGND CLK a_616_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1026 a_2149_74# a_616_74# a_1823_524# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_2580_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR CLK a_616_74# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1029 a_1017_81# a_803_74# a_288_464# VPB phighvt w=420000u l=150000u
-+  ad=1.9495e+11p pd=1.99e+06u as=0p ps=0u
-M1030 a_1823_524# a_616_74# a_1620_373# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1201_55# a_1017_81# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1140_495# a_616_74# a_1017_81# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1823_524# a_2580_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_288_464# D a_204_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1035 a_1620_373# a_1017_81# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1677_74# a_803_74# a_1823_524# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Q a_2580_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND SET_B a_2227_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_2191_180# a_1823_524# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1040 a_803_74# a_616_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.256e+11p pd=2.93e+06u as=0p ps=0u
-M1041 a_222_74# a_27_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1042 a_288_464# D a_222_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1044 a_204_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1046 VPWR a_2191_180# a_2103_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR a_1017_81# a_1620_373# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_1677_74# a_1017_81# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR a_2580_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VPWR a_2580_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1620_373# a_1017_81# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 Q a_2580_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_1677_74# a_803_74# a_1823_524# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_1201_55# a_1017_81# a_1445_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1823_524# a_616_74# a_2149_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_2191_180# a_1823_524# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR a_616_74# a_803_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_1823_524# a_616_74# a_1620_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 VGND a_27_74# a_222_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1445_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_2149_74# a_2191_180# a_2227_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_288_464# SCE a_417_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 Q a_2580_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VGND a_2580_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 a_1823_524# a_803_74# a_1677_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 VPWR SET_B a_1823_524# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VGND a_616_74# a_803_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND a_1017_81# a_1677_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_1677_74# a_1017_81# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 VPWR a_1823_524# a_2580_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 VGND a_2580_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_1153_81# a_1201_55# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR a_1017_81# a_1201_55# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_1201_55# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_204_464# D a_288_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VPWR a_1017_81# a_1620_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_288_464# a_616_74# a_1017_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 Q a_2580_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 VPWR SCE a_204_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_1017_81# a_616_74# a_1140_495# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_1620_373# a_616_74# a_1823_524# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X32 a_616_74# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 a_288_464# a_803_74# a_1017_81# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 VPWR a_2580_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 a_616_74# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 a_2580_74# a_1823_524# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 a_414_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X38 Q a_2580_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_2580_74# a_1823_524# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X41 VPWR a_2580_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X42 VGND a_1823_524# a_2191_180# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_1140_495# a_1201_55# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X44 a_222_74# D a_288_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 a_1017_81# a_803_74# a_1153_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 a_2227_74# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X47 a_288_464# a_27_74# a_414_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X48 a_1823_524# a_803_74# a_2103_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X49 a_2103_508# a_2191_180# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X50 a_417_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.cdl b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.cdl
index cf5b107..629478b 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_ls__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net132 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net120 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI639 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net153 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
-MI662 net153 S1 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI656 net132 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB 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
-MI658 net160 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB 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
-MI660 Q_N net153 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI641 net120 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net196 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 net153 S1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 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
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK 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
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net153 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
+MI662 net153 S1 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg 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
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net160 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N net153 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net196 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB 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
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB 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
+MI647 net153 S1 VPB 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
 .ENDS sky130_fd_sc_ls__sdfxbp_1
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.netlist.tsv
index 6c3957a..7e0582a 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_ls__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
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI657	MOSFET	M0	clkpos	net132	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net132	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net120	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net120	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net153	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net153	S1	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net196	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net160	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net153	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net196	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net160	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net153	S1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI657	MOSFET	M0	clkpos	net132	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net132	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net120	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net120	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net153	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net153	S1	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net196	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net160	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net153	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net196	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net160	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net153	S1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.spice b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.spice
index b9c049e..3b0c509 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.spice
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_ls__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VPWR SCE a_31_74# VPB phighvt w=640000u l=150000u
-+  ad=2.6944e+12p pd=2.048e+07u as=1.888e+11p ps=1.87e+06u
-M1001 a_434_74# SCE a_296_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.423e+11p ps=3.31e+06u
-M1002 VPWR a_1723_48# a_2216_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1003 a_1157_100# a_828_74# a_1021_100# VNB nshort w=420000u l=150000u
-+  ad=1.932e+11p pd=1.76e+06u as=2.226e+11p ps=1.9e+06u
-M1004 a_218_74# a_31_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.8401e+12p ps=1.538e+07u
-M1005 a_296_74# D a_218_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_233_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1007 a_828_74# a_612_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.136e+11p pd=2.8e+06u as=0p ps=0u
-M1008 VPWR SCD a_407_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.496e+11p ps=2.06e+06u
-M1009 a_1529_74# a_828_74# a_1243_398# VNB nshort w=550000u l=150000u
-+  ad=2.887e+11p pd=2.32e+06u as=1.5675e+11p ps=1.67e+06u
-M1010 a_1243_398# a_1021_100# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_1723_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1012 a_1723_48# a_1529_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1013 VPWR a_1243_398# a_1180_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1014 a_828_74# a_612_74# VGND VNB nshort w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1015 VGND a_1243_398# a_1157_100# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1021_100# a_828_74# a_296_74# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=3.096e+11p ps=3.28e+06u
-M1017 a_1681_74# a_612_74# a_1529_74# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1018 a_1243_398# a_1021_100# VPWR VPB phighvt w=840000u l=150000u
-+  ad=6.468e+11p pd=3.22e+06u as=0p ps=0u
-M1019 VGND a_1723_48# a_1681_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1529_74# a_612_74# a_1243_398# VPB phighvt w=840000u l=150000u
-+  ad=2.856e+11p pd=2.45e+06u as=0p ps=0u
-M1021 a_612_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1022 a_612_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1023 VGND SCE a_31_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1024 a_1180_496# a_612_74# a_1021_100# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q_N a_2216_112# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1026 a_296_74# D a_233_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND SCD a_434_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1021_100# a_612_74# a_296_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_1723_48# a_1691_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1030 Q a_1723_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1031 Q_N a_2216_112# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1032 a_407_464# a_31_74# a_296_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_1723_48# a_2216_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.5675e+11p ps=1.67e+06u
-M1034 a_1691_508# a_828_74# a_1529_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1723_48# a_1529_74# VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
+X0 VGND a_1021_100# a_1243_398# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 a_296_74# a_828_74# a_1021_100# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND CLK a_612_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR CLK a_612_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND a_1529_74# a_1723_48# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 a_407_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_1691_508# a_1723_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_31_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VPWR a_1021_100# a_1243_398# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 VGND a_2216_112# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_296_74# a_31_74# a_407_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_1529_74# a_828_74# a_1691_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_218_74# D a_296_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1180_496# a_1243_398# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_1243_398# a_612_74# a_1529_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_296_74# SCE a_434_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_434_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_296_74# a_612_74# a_1021_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR SCE a_233_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_2216_112# a_1723_48# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X20 VGND a_612_74# a_828_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 VPWR a_1723_48# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_1243_398# a_828_74# a_1529_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X23 VPWR a_612_74# a_828_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_1021_100# a_828_74# a_1157_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_1723_48# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_1021_100# a_612_74# a_1180_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 a_1681_74# a_1723_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VGND a_31_74# a_218_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_31_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1157_100# a_1243_398# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_2216_112# a_1723_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X32 a_233_464# D a_296_74# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 VPWR a_1529_74# a_1723_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X34 VPWR a_2216_112# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 a_1529_74# a_612_74# a_1681_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.cdl b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.cdl
index 087c08d..283caf1 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_ls__sdfxbp_2 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.525 perim=3.1
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net129 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net120 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI639 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI661 Q_N net153 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
-MI662 net153 S1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 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
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI656 net129 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB 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
-MI658 net160 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB 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
-MI660 Q_N net153 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MI641 net120 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net177 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI647 net153 S1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 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
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK 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
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI661 Q_N net153 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
+MI662 net153 S1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 S1 S0 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
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg 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
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net160 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N net153 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI643 net177 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 net153 S1 VPB pfet_01v8_hvt m=1 w=1.0 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_ls__sdfxbp_2
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.netlist.tsv
index 9a04715..c76e66f 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_ls__sdfxbp_2	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
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI657	MOSFET	M0	clkpos	net129	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net129	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net120	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net120	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net153	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net153	S1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net177	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net160	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net153	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net177	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net160	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net153	S1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI657	MOSFET	M0	clkpos	net129	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net129	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net120	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net120	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net153	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net153	S1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net177	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net160	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net153	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net177	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net160	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net153	S1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.spice b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.spice
index 5e75f80..3447988 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.spice
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_ls__sdfxbp_2 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_630_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.2043e+12p ps=1.954e+07u
-M1001 a_630_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=5.656e+11p pd=3.25e+06u as=3.1895e+12p ps=2.586e+07u
-M1002 VPWR a_2322_368# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.36e+11p ps=2.84e+06u
-M1003 a_301_74# D a_238_453# VPB phighvt w=640000u l=150000u
-+  ad=3.511e+11p pd=3.42e+06u as=1.728e+11p ps=1.82e+06u
-M1004 VPWR a_1243_48# a_1217_499# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 VPWR a_1711_48# a_2322_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1006 a_423_453# a_36_74# a_301_74# VPB phighvt w=640000u l=150000u
-+  ad=2.144e+11p pd=1.95e+06u as=0p ps=0u
-M1007 a_1711_48# a_1511_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1008 a_1663_74# a_630_74# a_1511_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.887e+11p ps=2.32e+06u
-M1009 VGND a_1711_48# a_1663_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Q a_1711_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1011 a_828_74# a_630_74# VGND VNB nshort w=740000u l=150000u
-+  ad=1.998e+11p pd=2.02e+06u as=0p ps=0u
-M1012 a_223_74# a_36_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1013 a_301_74# D a_223_74# VNB nshort w=420000u l=150000u
-+  ad=3.654e+11p pd=3.42e+06u as=0p ps=0u
-M1014 VGND a_1243_48# a_1173_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.6425e+11p ps=1.77e+06u
-M1015 a_1217_499# a_630_74# a_1021_97# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.617e+11p ps=1.61e+06u
-M1016 a_1511_74# a_630_74# a_1243_48# VPB phighvt w=840000u l=150000u
-+  ad=2.856e+11p pd=2.45e+06u as=5.418e+11p ps=2.97e+06u
-M1017 a_1021_97# a_630_74# a_301_74# VNB nshort w=420000u l=150000u
-+  ad=2.562e+11p pd=2.06e+06u as=0p ps=0u
-M1018 a_1243_48# a_1021_97# VGND VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=0p ps=0u
-M1019 Q_N a_2322_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.183e+11p pd=2.07e+06u as=0p ps=0u
-M1020 VPWR a_1711_48# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_1711_48# a_2322_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1022 Q a_1711_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1023 VPWR SCE a_36_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.432e+11p ps=2.04e+06u
-M1024 VGND SCD a_450_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 a_1711_48# a_1511_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1026 a_450_74# SCE a_301_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR SCD a_423_453# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1173_97# a_828_74# a_1021_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_1711_48# a_1691_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1030 a_238_453# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_828_74# a_630_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1032 VGND SCE a_36_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 a_1511_74# a_828_74# a_1243_48# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Q_N a_2322_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1021_97# a_828_74# a_301_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1691_508# a_828_74# a_1511_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_1711_48# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1243_48# a_1021_97# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_2322_368# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1021_97# a_1243_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VGND a_1711_48# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_1243_48# a_828_74# a_1511_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 Q a_1711_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_301_74# a_828_74# a_1021_97# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_1021_97# a_828_74# a_1173_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_301_74# a_36_74# a_423_453# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_301_74# SCE a_450_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Q_N a_2322_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_1691_508# a_1711_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VPWR SCE a_238_453# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_423_453# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VPWR a_2322_368# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_1511_74# a_828_74# a_1691_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_1243_48# a_630_74# a_1511_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_1663_74# a_1711_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_2322_368# a_1711_48# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 Q a_1711_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_450_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_630_74# a_828_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_2322_368# a_1711_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 VPWR a_630_74# a_828_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X22 a_223_74# D a_301_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR CLK a_630_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_1021_97# a_630_74# a_1217_499# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 Q_N a_2322_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_1511_74# a_630_74# a_1663_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_36_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 a_1217_499# a_1243_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_301_74# a_630_74# a_1021_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1173_97# a_1243_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_238_453# D a_301_74# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 VGND CLK a_630_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X33 VGND a_36_74# a_223_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VPWR a_1511_74# a_1711_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X35 a_36_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VGND a_1511_74# a_1711_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X37 VPWR a_1711_48# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X38 VGND a_1021_97# a_1243_48# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X39 VGND a_2322_368# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.cdl b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.cdl
index ea2c88b..2acef76 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 S1 S0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net78 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net71 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net163 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net138 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB 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
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net78 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net71 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK 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
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net163 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net138 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB 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
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfxtp_1
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.netlist.tsv
index df6e425..c6e263d 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__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
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net78	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net78	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net71	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net163	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net138	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net138	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net163	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net78	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net78	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net71	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net163	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net138	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net138	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net163	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.spice b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.spice
index 16648e2..1c82e59 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.spice
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_ls__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR a_1239_74# a_1202_508# VPB phighvt w=420000u l=150000u
-+  ad=2.3028e+12p pd=1.727e+07u as=1.05e+11p ps=1.34e+06u
-M1001 a_630_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.52935e+12p ps=1.307e+07u
-M1002 a_630_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1003 a_301_74# D a_238_464# VPB phighvt w=640000u l=150000u
-+  ad=3.159e+11p pd=3.31e+06u as=1.728e+11p ps=1.82e+06u
-M1004 VPWR a_1736_74# a_1688_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1005 VGND a_1736_74# a_1688_100# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 Q a_1736_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.248e+11p pd=2.82e+06u as=0p ps=0u
-M1007 a_1018_100# a_630_74# a_301_74# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=3.612e+11p ps=3.4e+06u
-M1008 VGND SCE a_35_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1009 a_1736_74# a_1520_74# VGND VNB nshort w=550000u l=150000u
-+  ad=1.4575e+11p pd=1.63e+06u as=0p ps=0u
-M1010 a_1239_74# a_1018_100# VGND VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1011 a_1688_508# a_828_74# a_1520_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.927e+11p ps=2.79e+06u
-M1012 a_412_464# a_35_74# a_301_74# VPB phighvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1013 a_1736_74# a_1520_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1014 Q a_1736_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.035e+11p pd=2.03e+06u as=0p ps=0u
-M1015 a_828_74# a_630_74# VGND VNB nshort w=740000u l=150000u
-+  ad=1.961e+11p pd=2.01e+06u as=0p ps=0u
-M1016 a_1520_74# a_630_74# a_1239_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=2.79e+06u
-M1017 a_223_74# a_35_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 a_301_74# D a_223_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1688_100# a_630_74# a_1520_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.223e+11p ps=2.48e+06u
-M1020 VGND a_1239_74# a_1154_100# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.785e+11p ps=1.69e+06u
-M1021 VPWR SCE a_35_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1022 a_828_74# a_630_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1023 a_1018_100# a_828_74# a_301_74# VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=0p ps=0u
-M1024 VGND SCD a_450_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 VPWR SCD a_412_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_238_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_450_74# SCE a_301_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1202_508# a_630_74# a_1018_100# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1154_100# a_828_74# a_1018_100# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1239_74# a_1018_100# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1520_74# a_828_74# a_1239_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1688_508# a_1736_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1154_100# a_1239_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_1736_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VPWR a_630_74# a_828_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_1018_100# a_828_74# a_1154_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_301_74# SCE a_450_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1239_74# a_828_74# a_1520_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 a_35_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_238_464# D a_301_74# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_1239_74# a_630_74# a_1520_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_301_74# a_630_74# a_1018_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1520_74# a_630_74# a_1688_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_35_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_450_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND a_630_74# a_828_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VPWR a_1018_100# a_1239_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_223_74# D a_301_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR CLK a_630_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 a_1202_508# a_1239_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_1688_100# a_1736_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR SCE a_238_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_412_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VGND a_1520_74# a_1736_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X23 a_301_74# a_828_74# a_1018_100# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_301_74# a_35_74# a_412_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 VGND a_1736_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_1520_74# a_828_74# a_1688_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 VGND CLK a_630_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X28 VGND a_35_74# a_223_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_1520_74# a_1736_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 VGND a_1018_100# a_1239_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X31 a_1018_100# a_630_74# a_1202_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.cdl b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.cdl
index 6b83968..9f9ddee 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__sdfxtp_2 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 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
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 S1 S0 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
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net75 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net54 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net122 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net155 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB 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
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net75 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net54 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK 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
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net122 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net155 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB 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
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfxtp_2
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.netlist.tsv
index a30db10..2e9d49c 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__sdfxtp_2	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
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net75	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net54	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net54	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net122	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net155	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net155	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net122	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net75	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net54	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net54	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net122	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net155	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net155	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net122	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.spice b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.spice
index 4ef2766..a6a86b5 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.spice
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_ls__sdfxtp_2 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 VGND SCD a_442_74# VNB nshort w=420000u l=150000u
-+  ad=1.84785e+12p pd=1.542e+07u as=1.008e+11p ps=1.32e+06u
-M1001 VGND a_1829_398# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.405e+11p ps=2.13e+06u
-M1002 a_1219_100# a_846_74# a_1044_100# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=3.045e+11p ps=2.29e+06u
-M1003 a_1287_320# a_1044_100# VGND VNB nshort w=550000u l=150000u
-+  ad=3.795e+11p pd=2.48e+06u as=0p ps=0u
-M1004 a_634_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=2.86313e+12p ps=2.094e+07u
-M1005 VPWR a_1287_320# a_1210_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.68e+11p ps=1.64e+06u
-M1006 a_439_453# a_27_74# a_300_453# VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=4.727e+11p ps=3.8e+06u
-M1007 a_1287_320# a_1044_100# VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.452e+11p pd=2.74e+06u as=0p ps=0u
-M1008 VGND a_1287_320# a_1219_100# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Q a_1829_398# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1010 a_1592_424# a_846_74# a_1287_320# VNB nshort w=550000u l=150000u
-+  ad=1.8825e+11p pd=1.82e+06u as=0p ps=0u
-M1011 a_1704_496# a_846_74# a_1592_424# VPB phighvt w=420000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=2.943e+11p ps=2.5e+06u
-M1012 a_442_74# SCE a_300_453# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.36e+06u
-M1013 a_300_453# D a_216_453# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1014 a_223_74# a_27_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1015 a_300_453# D a_223_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1829_398# a_1592_424# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1017 VPWR SCD a_439_453# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1829_398# a_1592_424# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1019 VPWR a_1829_398# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1787_74# a_634_74# a_1592_424# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1021 VGND a_1829_398# a_1787_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_216_453# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_1829_398# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1025 a_1592_424# a_634_74# a_1287_320# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1044_100# a_846_74# a_300_453# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1027 a_846_74# a_634_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1028 a_846_74# a_634_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1029 a_634_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1030 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1031 a_1210_508# a_634_74# a_1044_100# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_1829_398# a_1704_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1044_100# a_634_74# a_300_453# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1287_320# a_634_74# a_1592_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VPWR SCE a_216_453# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VGND a_1592_424# a_1829_398# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_300_453# a_846_74# a_1044_100# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_1044_100# a_846_74# a_1219_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_216_453# D a_300_453# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_300_453# a_634_74# a_1044_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_634_74# a_846_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND a_634_74# a_846_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND a_1044_100# a_1287_320# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 VPWR a_1829_398# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_439_453# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VPWR CLK a_634_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_1219_100# a_1287_320# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1592_424# a_846_74# a_1704_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_1787_74# a_1829_398# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_223_74# D a_300_453# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1044_100# a_634_74# a_1210_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_1210_508# a_1287_320# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_1704_496# a_1829_398# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VGND CLK a_634_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_300_453# a_27_74# a_439_453# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VGND a_1829_398# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_300_453# SCE a_442_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1287_320# a_846_74# a_1592_424# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X25 VPWR a_1592_424# a_1829_398# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X26 Q a_1829_398# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_442_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1592_424# a_634_74# a_1787_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_1044_100# a_1287_320# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 Q a_1829_398# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 VGND a_27_74# a_223_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_27_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.cdl b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.cdl
index 0b4b8ef..778bf1b 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_ls__sdfxtp_4 CLK D SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI652 M1 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 S1 S0 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
-MI634 M1 M0 VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI652 M1 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 S1 S0 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
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net78 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI641 net71 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S1 VNB 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
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI103 n1 SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI120 db SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI104 n0 sceb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.525 perim=3.1
-MI643 net163 S1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI640 sceb SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net155 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S1 VPB phighvt 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
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 M1 clkneg VPB 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
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI639 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 S1 S0 VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net78 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI641 net71 S1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S1 VNB nfet_01v8 m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK 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
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI98 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI103 n1 SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI120 db SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI104 n0 sceb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.525 perim=3.1
+MI643 net163 S1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI640 sceb SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net155 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 Q S1 VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 S1 S0 VPB pfet_01v8_hvt m=2 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI664 M1 M0 VPB 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
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI94 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M1 M0 VPB 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
-MI107 p0 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI108 p1 SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI101 db sceb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sdfxtp_4
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.netlist.tsv
index 5a83187..a950c35 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_ls__sdfxtp_4	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
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net78	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net78	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net71	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S1	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI98	MOSFET	db	D	n0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI103	MOSFET	n1	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI120	MOSFET	db	SCE	n1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI104	MOSFET	n0	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	net163	S1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net155	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net155	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net163	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net78	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net78	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net71	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S1	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI98	MOSFET	db	D	n0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI103	MOSFET	n1	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI120	MOSFET	db	SCE	n1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI104	MOSFET	n0	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	net163	S1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net155	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net155	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net163	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.spice b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.spice
index 34b6615..8d6136d 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.spice
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.spice
@@ -16,82 +16,43 @@
 
 
 .subckt sky130_fd_sc_ls__sdfxtp_4 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1026_100# a_828_74# a_301_74# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=3.159e+11p ps=3.31e+06u
-M1001 a_630_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.77695e+12p ps=1.604e+07u
-M1002 VPWR a_1814_48# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.01978e+12p pd=2.28e+07u as=6.72e+11p ps=5.68e+06u
-M1003 VGND a_1814_48# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.773e+11p ps=4.25e+06u
-M1004 a_1257_74# a_1026_100# VPWR VPB phighvt w=840000u l=150000u
-+  ad=7.56e+11p pd=3.48e+06u as=0p ps=0u
-M1005 a_1764_476# a_828_74# a_1587_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=2.898e+11p ps=2.46e+06u
-M1006 VPWR a_1814_48# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_301_74# D a_238_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1008 VGND SCD a_452_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 a_452_74# SCE a_301_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.738e+11p ps=3.46e+06u
-M1010 a_1814_48# a_1587_74# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1011 a_1214_506# a_630_74# a_1026_100# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1012 a_1162_100# a_828_74# a_1026_100# VNB nshort w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=2.226e+11p ps=1.9e+06u
-M1013 Q a_1814_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_1814_48# a_1766_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1015 Q a_1814_48# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_412_464# a_36_74# a_301_74# VPB phighvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=0p ps=0u
-M1017 a_828_74# a_630_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1018 a_1766_74# a_630_74# a_1587_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4e+11p ps=2.59e+06u
-M1019 a_828_74# a_630_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1020 a_223_74# a_36_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1021 a_301_74# D a_223_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1587_74# a_630_74# a_1257_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_630_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1024 VPWR SCE a_36_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1025 a_1026_100# a_630_74# a_301_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1257_74# a_1214_506# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_1587_74# a_1814_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1028 VGND a_1814_48# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR SCD a_412_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1587_74# a_828_74# a_1257_74# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=2.365e+11p ps=1.96e+06u
-M1031 a_238_464# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Q a_1814_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q a_1814_48# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_1257_74# a_1162_100# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1257_74# a_1026_100# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCE a_36_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1037 VPWR a_1814_48# a_1764_476# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_1587_74# a_1814_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1764_476# a_1814_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1214_506# a_1257_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1026_100# a_828_74# a_1162_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1766_74# a_1814_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_452_74# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1026_100# a_630_74# a_1214_506# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_1587_74# a_828_74# a_1764_476# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_1814_48# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 VPWR a_1587_74# a_1814_48# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 Q a_1814_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR a_1026_100# a_1257_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 a_238_464# D a_301_74# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VPWR a_1814_48# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 Q a_1814_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_36_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 VGND a_630_74# a_828_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_301_74# a_630_74# a_1026_100# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1257_74# a_630_74# a_1587_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_1257_74# a_828_74# a_1587_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X19 a_1587_74# a_630_74# a_1766_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 Q a_1814_48# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_1814_48# a_1587_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 a_223_74# D a_301_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_301_74# SCE a_452_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1814_48# a_1587_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 VPWR SCE a_238_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 a_412_464# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 VPWR a_630_74# a_828_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_301_74# a_828_74# a_1026_100# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_1162_100# a_1257_74# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND a_1026_100# a_1257_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X31 a_301_74# a_36_74# a_412_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 Q a_1814_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X33 VGND CLK a_630_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X34 VGND a_36_74# a_223_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VPWR CLK a_630_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X36 a_36_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VGND a_1814_48# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 VPWR a_1814_48# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.cdl b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.cdl
index 7d7e46e..f4103bc 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net76 CLK VPB 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
-MI658 net76 m1 VPB 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
-MI19 m1 M0 VPB 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
-MI22 net63 SCE VPB 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
-MI21 net116 GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB 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
-MI660 GCLK net76 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI659 net76 CLK VPB 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
-MI43 net116 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 VPB 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
-MI42 net116 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI19 m1 M0 VPB 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
-MI20 m1 M0 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
-MI655 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net116 SCE VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net116 GATE VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI22 net63 SCE VPB 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
-MI44 clkpos CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net116 GATE VPB 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
+MI47 clkneg clkpos VPB 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
+MI45 clkpos CLK VPB 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
+MI660 GCLK net76 VPB 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
+MI43 net116 clkneg VPB 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
+MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 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
-MI653 GCLK net76 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
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net116 SCE VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=1 w=0.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_ls__sdlclkp_1
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.netlist.tsv
index 3e36a06..6b5aec1 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__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
-MI662	MOSFET	net88	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net88	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net76	CLK	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net63	SCE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net63	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net123	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net116	SCE	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net76	m1	net112	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net116	GATE	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net76	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net88	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net88	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net76	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net76	m1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net63	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net116	GATE	net63	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net76	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net116	clkneg	M0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net123	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net116	SCE	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net76	m1	net112	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net116	GATE	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net76	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/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.spice b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.spice
index 1158284..d63a4e3 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.spice
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_318_74# a_288_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.3368e+12p ps=1.136e+07u
-M1001 VPWR a_709_54# a_722_492# VPB phighvt w=420000u l=150000u
-+  ad=1.92175e+12p pd=1.454e+07u as=1.008e+11p ps=1.32e+06u
-M1002 VGND CLK a_288_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1003 a_1166_94# CLK VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1004 a_318_74# a_288_48# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1005 a_1238_94# a_709_54# a_1166_94# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1006 a_566_74# a_318_74# a_114_112# VPB phighvt w=840000u l=150000u
-+  ad=3.10975e+11p pd=2.74e+06u as=4.956e+11p ps=4.54e+06u
-M1007 a_709_54# a_566_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1008 VGND GATE a_114_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=4.4825e+11p ps=3.83e+06u
-M1009 a_114_112# SCE VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1238_94# CLK VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1011 GCLK a_1238_94# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=4.256e+11p pd=3e+06u as=0p ps=0u
-M1012 a_667_80# a_318_74# a_566_74# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.846e+11p ps=1.81e+06u
-M1013 VGND a_709_54# a_667_80# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_116_424# SCE VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1015 a_566_74# a_288_48# a_114_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_709_54# a_566_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1017 VPWR a_709_54# a_1238_94# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 GCLK a_1238_94# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1019 a_114_112# GATE a_116_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_722_492# a_288_48# a_566_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR CLK a_288_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.27e+06u
+X0 a_566_74# a_318_74# a_667_80# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_288_48# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_116_424# GATE a_114_112# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_722_492# a_709_54# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_114_112# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 VPWR CLK a_1238_94# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 VGND a_288_48# a_318_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_288_48# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 VGND a_1238_94# GCLK VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR a_566_74# a_709_54# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 a_1166_94# a_709_54# a_1238_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_566_74# a_288_48# a_722_492# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_667_80# a_709_54# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR SCE a_116_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_1238_94# a_709_54# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_114_112# a_288_48# a_566_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X16 VPWR a_288_48# a_318_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 VGND SCE a_114_112# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X18 a_114_112# a_318_74# a_566_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X19 VPWR a_1238_94# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND CLK a_1166_94# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VGND a_566_74# a_709_54# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.cdl b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.cdl
index fdfdb17..a3970e3 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__sdlclkp_2 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net76 CLK VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net76 m1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 m1 M0 VPB 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
-MI22 net63 SCE VPB 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
-MI21 net116 GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB 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
-MI660 GCLK net76 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MI659 net76 CLK VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net116 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net116 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI19 m1 M0 VPB 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
-MI20 m1 M0 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
-MI655 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net116 SCE VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK 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
-MI656 net76 m1 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
-MI23 net116 GATE VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI22 net63 SCE VPB 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
-MI44 clkpos CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net116 GATE VPB 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
+MI47 clkneg clkpos VPB 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
+MI45 clkpos CLK VPB 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
+MI660 GCLK net76 VPB 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
+MI43 net116 clkneg VPB 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
+MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 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
-MI653 GCLK net76 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
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net116 SCE VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=2 w=0.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_ls__sdlclkp_2
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.netlist.tsv
index 40fb21f..28db631 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__sdlclkp_2	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
-MI662	MOSFET	net88	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net88	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net76	CLK	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net63	SCE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net63	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net123	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net116	SCE	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net76	m1	net112	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net116	GATE	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net76	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net88	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net88	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net76	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net76	m1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net63	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net116	GATE	net63	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net76	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net116	clkneg	M0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net123	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net116	SCE	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net76	m1	net112	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net116	GATE	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net76	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.spice b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.spice
index 8c53bc3..c18ce21 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.spice
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__sdlclkp_2 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_114_112# GATE a_114_424# VPB phighvt w=840000u l=150000u
-+  ad=4.788e+11p pd=4.5e+06u as=2.016e+11p ps=2.16e+06u
-M1001 a_706_317# a_580_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=1.5071e+12p ps=1.328e+07u
-M1002 a_318_74# a_288_48# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1003 a_318_74# a_288_48# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=2.16985e+12p ps=1.718e+07u
-M1004 a_708_451# a_288_48# a_580_74# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.772e+11p ps=2.43e+06u
-M1005 GCLK a_1195_374# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1006 GCLK a_1195_374# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1007 a_1195_374# a_706_317# a_1198_74# VNB nshort w=740000u l=150000u
-+  ad=2.035e+11p pd=2.03e+06u as=1.554e+11p ps=1.9e+06u
-M1008 a_706_317# a_580_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1009 VGND GATE a_114_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=4.8675e+11p ps=3.97e+06u
-M1010 VPWR a_706_317# a_1195_374# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.15e+11p ps=3.03e+06u
-M1011 a_114_112# SCE VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_706_317# a_708_451# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR CLK a_288_48# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1014 VPWR a_1195_374# GCLK VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1198_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_1195_374# GCLK VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_580_74# a_318_74# a_114_112# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1195_374# CLK VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_685_81# a_318_74# a_580_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.9475e+11p ps=1.85e+06u
-M1020 VGND a_706_317# a_685_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_114_424# SCE VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_580_74# a_288_48# a_114_112# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_288_48# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
+X0 a_114_112# a_318_74# a_580_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_1195_374# a_706_317# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VGND a_1195_374# GCLK VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR a_580_74# a_706_317# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_114_424# GATE a_114_112# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 GCLK a_1195_374# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR a_288_48# a_318_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 GCLK a_1195_374# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_114_112# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_114_112# a_288_48# a_580_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 VGND a_288_48# a_318_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VGND CLK a_1198_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 VPWR CLK a_1195_374# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_685_81# a_706_317# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_708_451# a_706_317# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR SCE a_114_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VGND a_580_74# a_706_317# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_1198_74# a_706_317# a_1195_374# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_580_74# a_318_74# a_685_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR a_1195_374# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 a_288_48# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_580_74# a_288_48# a_708_451# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VGND SCE a_114_112# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X23 a_288_48# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.cdl b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.cdl
index ce4f098..6d740f9 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__sdlclkp_4 CLK GATE SCE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I SCE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net88 m1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 M0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net76 CLK VPB 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
-MI658 net76 m1 VPB 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
-MI19 m1 M0 VPB 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
-MI22 net63 SCE VPB 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
-MI21 net116 GATE VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI662 net88 m1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 clkneg clkpos VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkpos CLK VPB 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
-MI660 GCLK net76 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MI659 net76 CLK VPB 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
-MI43 net116 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 VPB 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
-MI42 net116 clkpos VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265
+MI19 m1 M0 VPB 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
-MI20 m1 M0 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
-MI655 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net123 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net116 SCE VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK 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
-MI656 net76 m1 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
-MI23 net116 GATE VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI22 net63 SCE VPB 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
-MI44 clkpos CLK VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net116 GATE VPB 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
+MI47 clkneg clkpos VPB 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
+MI45 clkpos CLK VPB 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
+MI660 GCLK net76 VPB 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
+MI43 net116 clkneg VPB 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
+MI42 net116 clkpos VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 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
-MI653 GCLK net76 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
+MI655 M0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net123 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net116 SCE VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=4 w=0.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_ls__sdlclkp_4
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.netlist.tsv
index 323446f..508a1a3 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__sdlclkp_4	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
-MI662	MOSFET	net88	m1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net88	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net76	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net63	SCE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net63	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net123	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net116	SCE	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net76	m1	net112	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net116	GATE	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net76	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net88	m1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net88	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net76	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net76	m1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net63	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net116	GATE	net63	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net76	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net116	clkneg	M0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net123	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net116	SCE	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net76	m1	net112	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net116	GATE	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net76	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.spice b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.spice
index 367f29c..3b0c177 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.spice
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__sdlclkp_4 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 a_792_48# a_634_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=2.6355e+12p ps=1.988e+07u
-M1001 VGND a_1289_368# GCLK VNB nshort w=740000u l=150000u
-+  ad=1.98545e+12p pd=1.63e+07u as=4.514e+11p ps=4.18e+06u
-M1002 a_354_105# a_324_79# VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.033e+11p pd=3.02e+06u as=0p ps=0u
-M1003 GCLK a_1289_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=8.68e+11p pd=6.03e+06u as=0p ps=0u
-M1004 a_792_48# a_634_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 VGND a_792_48# a_744_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 VPWR a_792_48# a_785_455# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1007 a_1292_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1008 a_1289_368# a_792_48# a_1292_74# VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1009 a_116_395# SCE VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1010 VPWR a_1289_368# GCLK VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND CLK a_324_79# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1012 a_785_455# a_324_79# a_634_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.856e+11p ps=2.45e+06u
-M1013 GCLK a_1289_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_634_74# a_354_105# a_119_143# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.956e+11p ps=4.54e+06u
-M1015 a_1289_368# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=5.544e+11p pd=3.23e+06u as=0p ps=0u
-M1016 a_744_74# a_354_105# a_634_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.1025e+11p ps=1.9e+06u
-M1017 a_354_105# a_324_79# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1018 VPWR a_792_48# a_1289_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_119_143# SCE VGND VNB nshort w=550000u l=150000u
-+  ad=5.61e+11p pd=4.24e+06u as=0p ps=0u
-M1020 a_119_143# GATE a_116_395# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_1289_368# GCLK VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_634_74# a_324_79# a_119_143# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR CLK a_324_79# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1024 GCLK a_1289_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND GATE a_119_143# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 GCLK a_1289_368# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_1289_368# GCLK VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_324_79# a_354_105# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_324_79# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 VPWR SCE a_116_395# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_116_395# GATE a_119_143# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR a_634_74# a_792_48# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_1289_368# a_792_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_324_79# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_634_74# a_354_105# a_744_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_119_143# a_354_105# a_634_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_744_74# a_792_48# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_324_79# a_354_105# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR a_1289_368# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 GCLK a_1289_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 a_1292_74# a_792_48# a_1289_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X14 GCLK a_1289_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND a_1289_368# GCLK VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_785_455# a_792_48# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VGND a_634_74# a_792_48# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 VGND a_1289_368# GCLK VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 VPWR CLK a_1289_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VPWR a_1289_368# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 VGND SCE a_119_143# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X22 a_634_74# a_324_79# a_785_455# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_119_143# a_324_79# a_634_74# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X24 VGND CLK a_1292_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 GCLK a_1289_368# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 GCLK a_1289_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_119_143# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.cdl b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.cdl
index 3f4a222..4cacf9e 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.cdl
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_ls__sedfxbp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI14 net154 M1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI14 net154 M1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB 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
-MI658 net143 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI637 clkpos clkneg VPB 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
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net126 q1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N q1 VPB 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
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net111 deneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net107 sceneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI645 Q S0 VPB 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
-MI46 VPWR SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net99 D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net99 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net91 q1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 net143 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI661 Q_N q1 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
-MI641 net235 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB 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
-MI656 net214 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net99 sceneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB 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
-MI18 q1 S0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI643 net126 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N q1 VPB 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
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 net111 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net107 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net99 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net99 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net91 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI32 net99 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI635 clkneg CLK 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
+MI661 Q_N q1 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
-MI16 net195 M1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI641 net235 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 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
-MI15 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net214 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net99 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net182 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net99 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net195 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net182 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net198 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net166 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net198 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net166 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sedfxbp_1
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.netlist.tsv b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.netlist.tsv
index f3f4ab4..b4db223 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.netlist.tsv
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_ls__sedfxbp_1	CLK:I D:I DE: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
-MI14	MOSFET	net154	M1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net154	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net143	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net126	q1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net126	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	q1	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net143	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net111	deneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net107	sceneg	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net107	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net99	D	net111	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net99	SCE	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net91	q1	net99	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net91	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	q1	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net235	q1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net235	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net214	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net214	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net99	sceneg	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net99	D	net198	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net195	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net195	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net182	q1	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net182	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net198	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net166	SCE	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net166	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net154	M1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net154	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net143	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net126	q1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net126	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	q1	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net143	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net111	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net107	sceneg	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net107	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net99	D	net111	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net99	SCE	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net91	q1	net99	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net91	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	q1	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net235	q1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net235	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net214	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net214	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net99	sceneg	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net99	D	net198	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net195	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net195	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net182	q1	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net182	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net198	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net166	SCE	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net166	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.spice b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.spice
index 783e2a6..f3148a8 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.spice
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ls__sedfxbp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 Q_N a_575_305# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.2449e+12p ps=1.863e+07u
-M1001 a_27_90# a_575_305# a_533_113# VNB nshort w=420000u l=150000u
-+  ad=3.276e+11p pd=3.24e+06u as=1.008e+11p ps=1.32e+06u
-M1002 a_575_305# a_2463_74# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=2.97045e+12p ps=2.379e+07u
-M1003 VPWR SCE a_667_87# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.304e+11p ps=2e+06u
-M1004 a_1549_74# a_1348_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1005 a_1972_92# a_1747_118# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1006 a_2647_508# a_1549_74# a_2463_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=3.328e+11p ps=2.77e+06u
-M1007 a_697_113# a_667_87# a_1068_462# VPB phighvt w=640000u l=150000u
-+  ad=5.078e+11p pd=5.2e+06u as=1.536e+11p ps=1.76e+06u
-M1008 a_1549_74# a_1348_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1009 a_533_113# a_161_394# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_697_113# SCE a_1075_125# VNB nshort w=420000u l=150000u
-+  ad=3.885e+11p pd=4.37e+06u as=1.008e+11p ps=1.32e+06u
-M1011 a_27_90# a_575_305# a_556_464# VPB phighvt w=640000u l=150000u
-+  ad=3.808e+11p pd=3.75e+06u as=1.728e+11p ps=1.82e+06u
-M1012 VGND DE a_161_394# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1013 a_157_90# D a_27_90# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1014 VGND DE a_157_90# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1348_368# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1016 a_2391_74# a_1972_92# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1017 a_1747_118# a_1549_74# a_697_113# VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=0p ps=0u
-M1018 a_2463_74# a_1549_74# a_2391_74# VNB nshort w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1019 VPWR DE a_161_394# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1020 a_556_464# DE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_697_113# SCE a_27_90# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_1972_92# a_1895_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.617e+11p ps=1.61e+06u
-M1023 a_116_464# D a_27_90# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1024 a_1075_125# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1931_508# a_1348_368# a_1747_118# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1026 a_697_113# a_667_87# a_27_90# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_2463_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1028 a_575_305# a_2463_74# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1029 VPWR a_161_394# a_116_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2463_74# a_1348_368# a_2345_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=8.25e+11p ps=3.65e+06u
-M1031 a_2565_74# a_1348_368# a_2463_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1032 VGND a_575_305# a_2565_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1068_462# SCD VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1348_368# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1035 a_1972_92# a_1747_118# VGND VNB nshort w=640000u l=150000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1036 VGND a_2463_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1037 VGND SCE a_667_87# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1038 a_2345_392# a_1972_92# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_575_305# a_2647_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 Q_N a_575_305# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1041 VPWR a_1972_92# a_1931_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1747_118# a_1348_368# a_697_113# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.02e+06u as=0p ps=0u
-M1043 a_1895_118# a_1549_74# a_1747_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_2345_392# a_1348_368# a_2463_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_533_113# a_575_305# a_27_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_697_113# a_1549_74# a_1747_118# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_161_394# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Q a_2463_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_1895_118# a_1972_92# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_2463_74# a_575_305# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_1075_125# SCE a_697_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_1348_368# a_1549_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR a_1747_118# a_1972_92# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND a_575_305# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_157_90# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_667_87# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VGND a_161_394# a_533_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_2565_74# a_575_305# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1747_118# a_1348_368# a_1931_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 Q a_2463_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_27_90# D a_116_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_27_90# SCE a_697_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_161_394# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 VGND CLK a_1348_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_1068_462# a_667_87# a_697_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_667_87# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_27_90# D a_157_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_2391_74# a_1549_74# a_2463_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 VPWR a_575_305# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 VGND a_1348_368# a_1549_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_2463_74# a_1348_368# a_2565_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR CLK a_1348_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_1747_118# a_1549_74# a_1895_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND a_1747_118# a_1972_92# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 a_697_113# a_1348_368# a_1747_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VGND a_2463_74# a_575_305# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X33 a_1931_508# a_1972_92# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 VPWR DE a_556_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 a_27_90# a_667_87# a_697_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_1972_92# a_2345_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X37 a_2463_74# a_1549_74# a_2647_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X38 a_116_464# a_161_394# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X39 VPWR SCD a_1068_462# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X40 VGND SCD a_1075_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 VGND a_1972_92# a_2391_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X42 a_556_464# a_575_305# a_27_90# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X43 a_2647_508# a_575_305# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.cdl b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.cdl
index f9a1b69..a22de7d 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.cdl
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_ls__sedfxbp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI14 net154 M1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI14 net154 M1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB 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
-MI658 net118 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI637 clkpos clkneg VPB 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
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net126 q1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q_N q1 VPB 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
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB 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
-MI33 net111 deneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net102 sceneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI645 Q S0 VPB 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
-MI46 VPWR SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net99 D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net99 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net82 q1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 net118 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI661 Q_N q1 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
-MI641 net230 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB 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
-MI656 net219 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net99 sceneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB 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
-MI18 q1 S0 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI643 net126 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q_N q1 VPB 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
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB 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 net111 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net102 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net99 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net99 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net82 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI635 clkneg CLK 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
+MI661 Q_N q1 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
-MI32 net99 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI641 net230 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 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
-MI16 net195 M1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net219 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net99 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net99 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net182 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net195 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net182 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net175 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net171 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net175 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net171 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sedfxbp_2
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.netlist.tsv b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.netlist.tsv
index eed5d5a..206f5ee 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.netlist.tsv
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_ls__sedfxbp_2	CLK:I D:I DE: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
-MI14	MOSFET	net154	M1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net154	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net118	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net126	q1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net126	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	q1	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net118	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net111	deneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net102	sceneg	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net102	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net99	D	net111	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net99	SCE	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net82	q1	net99	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net82	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	q1	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net230	q1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net230	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net219	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net219	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net99	sceneg	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net99	D	net175	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net195	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net195	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net182	q1	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net182	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net175	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net171	SCE	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net171	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net154	M1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net154	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net118	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net126	q1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net126	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	q1	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net118	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net111	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net102	sceneg	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net102	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net99	D	net111	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net99	SCE	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net82	q1	net99	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net82	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	q1	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net230	q1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net230	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net219	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net219	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net99	sceneg	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net99	D	net175	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net195	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net195	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net182	q1	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net182	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net175	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net171	SCE	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net171	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.spice b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.spice
index 32668a2..515ead6 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.spice
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_ls__sedfxbp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_691_113# a_661_87# a_1088_453# VPB phighvt w=640000u l=150000u
-+  ad=5.015e+11p pd=5.17e+06u as=1.728e+11p ps=1.82e+06u
-M1001 a_1586_74# a_1374_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=3.65505e+12p ps=2.974e+07u
-M1002 VPWR a_2013_71# a_1944_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1003 a_1586_74# a_1374_368# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=2.61097e+12p ps=2.285e+07u
-M1004 a_132_464# D a_32_74# VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=3.808e+11p ps=3.75e+06u
-M1005 Q a_2489_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1006 a_32_74# a_575_87# a_527_113# VNB nshort w=420000u l=150000u
-+  ad=2.835e+11p pd=3.03e+06u as=1.008e+11p ps=1.32e+06u
-M1007 a_1374_368# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1008 a_1784_97# a_1586_74# a_691_113# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1009 a_2417_74# a_2013_71# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1010 a_691_113# a_661_87# a_32_74# VNB nshort w=420000u l=150000u
-+  ad=3.885e+11p pd=4.37e+06u as=0p ps=0u
-M1011 a_2489_74# a_1586_74# a_2417_74# VNB nshort w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1012 a_1088_453# SCD VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_2591_74# a_1374_368# a_2489_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1014 a_575_87# a_2489_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1015 a_2489_74# a_1374_368# a_2374_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.328e+11p pd=2.77e+06u as=8.05e+11p ps=3.61e+06u
-M1016 VPWR a_2489_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR DE a_183_290# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1018 a_32_74# a_575_87# a_578_462# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1019 a_1944_508# a_1374_368# a_1784_97# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_575_87# a_2489_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1021 a_1091_125# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1022 VPWR a_575_87# a_2672_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1023 a_2013_71# a_1784_97# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1024 a_527_113# a_183_290# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_2672_508# a_1586_74# a_2489_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_575_87# a_2591_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q_N a_575_87# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1028 VGND DE a_183_290# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1029 VPWR a_183_290# a_132_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2013_71# a_1784_97# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1031 Q_N a_575_87# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1032 Q a_2489_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1033 a_691_113# SCE a_32_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_2013_71# a_1920_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.953e+11p ps=1.77e+06u
-M1035 a_1374_368# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1036 a_691_113# SCE a_1091_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1784_97# a_1374_368# a_691_113# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=0p ps=0u
-M1038 VPWR a_575_87# Q_N VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND SCE a_661_87# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1040 a_1920_97# a_1586_74# a_1784_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND a_575_87# Q_N VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND DE a_141_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1043 VGND a_2489_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_578_462# DE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR SCE a_661_87# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.952e+11p ps=1.89e+06u
-M1046 a_2374_392# a_2013_71# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_141_74# D a_32_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_183_290# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_32_74# D a_141_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_1784_97# a_2013_71# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 VGND SCD a_1091_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_2013_71# a_2374_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 VGND a_2489_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 Q a_2489_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_32_74# D a_132_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_2591_74# a_575_87# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_183_290# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1920_97# a_2013_71# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_661_87# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1784_97# a_1374_368# a_1944_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_2489_74# a_1374_368# a_2591_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_141_74# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_575_87# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 VGND a_575_87# Q_N VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 a_578_462# a_575_87# a_32_74# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_1944_508# a_2013_71# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VGND a_183_290# a_527_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_1784_97# a_2013_71# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 Q_N a_575_87# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_2417_74# a_1586_74# a_2489_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 VPWR a_2489_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 a_132_464# a_183_290# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 VPWR SCD a_1088_453# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VGND a_2489_74# a_575_87# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 a_527_113# a_575_87# a_32_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_691_113# a_1374_368# a_1784_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1091_125# SCE a_691_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1088_453# a_661_87# a_691_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 a_2672_508# a_575_87# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 a_1784_97# a_1586_74# a_1920_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_691_113# a_1586_74# a_1784_97# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 VGND a_1374_368# a_1586_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X35 VGND a_2013_71# a_2417_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X36 VPWR a_2489_74# a_575_87# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 VPWR CLK a_1374_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X38 a_2374_392# a_1374_368# a_2489_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X39 VPWR DE a_578_462# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X40 VGND CLK a_1374_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X41 Q_N a_575_87# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X42 a_32_74# SCE a_691_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X43 VPWR a_1374_368# a_1586_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X44 a_2489_74# a_1586_74# a_2672_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X45 Q a_2489_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X46 a_661_87# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X47 a_32_74# a_661_87# a_691_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.cdl b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.cdl
index ad6a576..d99d90f 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.cdl
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.cdl
@@ -16,88 +16,88 @@
 
 .SUBCKT sky130_fd_sc_ls__sedfxtp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI14 net146 M1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI14 net146 M1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB 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
-MI658 net114 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI637 clkpos clkneg VPB 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
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net118 q1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 deneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net98 sceneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI645 Q S0 VPB 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
-MI46 VPWR SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net95 D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net95 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net78 q1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 net114 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI641 net222 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB 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
-MI656 net211 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net95 sceneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB 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
-MI18 q1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI643 net118 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net107 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net98 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net95 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net95 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net78 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI635 clkneg CLK 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
+MI641 net222 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 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
-MI32 net95 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net211 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net95 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net187 M1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net95 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net187 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net174 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net174 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net167 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net163 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net167 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net163 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sedfxtp_1
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.netlist.tsv b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.netlist.tsv
index bc20dc5..9356381 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.netlist.tsv
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ls__sedfxtp_1	CLK:I D:I DE: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
-MI14	MOSFET	net146	M1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net146	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net114	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net118	q1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net118	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net114	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net107	deneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net98	sceneg	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net98	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net95	D	net107	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net95	SCE	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net78	q1	net95	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net78	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net222	q1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net222	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net211	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net211	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net95	sceneg	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net95	D	net167	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net187	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net187	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net174	q1	net95	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net174	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net167	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net163	SCE	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net163	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net146	M1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net146	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net114	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net118	q1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net118	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net114	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net107	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net98	sceneg	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net98	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net95	D	net107	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net95	SCE	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net78	q1	net95	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net78	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net222	q1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net222	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net211	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net211	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net95	sceneg	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net95	D	net167	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net187	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net187	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net174	q1	net95	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net174	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net167	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net163	SCE	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net163	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.spice b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.spice
index 8a1b8c5..032fc20 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.spice
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_ls__sedfxtp_1 CLK D DE SCD SCE VGND VNB VPB VPWR Q
-M1000 VGND DE a_143_74# VNB nshort w=420000u l=150000u
-+  ad=1.9208e+12p pd=1.749e+07u as=1.008e+11p ps=1.32e+06u
-M1001 VGND a_2385_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1002 a_1492_74# a_1295_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1003 a_1053_455# SCD VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=2.66035e+12p ps=2.257e+07u
-M1004 VPWR a_1910_71# a_1890_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1005 VGND DE a_159_404# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1006 a_1688_97# a_1492_74# a_669_111# VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=4.696e+11p ps=5.06e+06u
-M1007 a_505_111# a_159_404# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 VPWR SCE a_639_85# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1009 a_1295_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1010 a_143_74# D a_27_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.982e+11p ps=3.1e+06u
-M1011 a_547_301# a_2385_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1012 a_1492_74# a_1295_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1013 a_1890_508# a_1295_74# a_1688_97# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_2385_74# a_1295_74# a_2274_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.328e+11p pd=2.77e+06u as=7.85e+11p ps=3.57e+06u
-M1015 a_2313_74# a_1910_71# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1016 a_554_463# DE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1017 a_2385_74# a_1492_74# a_2313_74# VNB nshort w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1018 a_669_111# a_639_85# a_1053_455# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_547_301# a_2385_74# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=0p ps=0u
-M1020 VPWR a_547_301# a_2568_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1021 a_669_111# a_639_85# a_27_74# VNB nshort w=420000u l=150000u
-+  ad=3.843e+11p pd=4.35e+06u as=0p ps=0u
-M1022 a_1688_97# a_1295_74# a_669_111# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=0p ps=0u
-M1023 VPWR DE a_159_404# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1024 a_1295_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1025 VPWR a_2385_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.08e+11p ps=2.79e+06u
-M1026 a_669_111# SCE a_1026_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1027 VGND a_1910_71# a_1824_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.806e+11p ps=1.7e+06u
-M1028 a_1026_125# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1824_97# a_1492_74# a_1688_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1910_71# a_1688_97# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1031 a_669_111# SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.744e+11p ps=3.73e+06u
-M1032 a_1910_71# a_1688_97# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.31e+11p pd=2.23e+06u as=0p ps=0u
-M1033 a_2274_392# a_1910_71# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_114_464# D a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1035 a_2568_508# a_1492_74# a_2385_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_547_301# a_2487_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1037 a_2487_74# a_1295_74# a_2385_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_27_74# a_547_301# a_505_111# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND SCE a_639_85# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1040 a_27_74# a_547_301# a_554_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_159_404# a_114_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_2385_74# a_1295_74# a_2487_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_639_85# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_1295_74# a_1492_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Q a_2385_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 a_159_404# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_2385_74# a_1492_74# a_2568_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR CLK a_1295_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_1053_455# a_639_85# a_669_111# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 Q a_2385_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_159_404# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 VGND a_1910_71# a_2313_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_639_85# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_27_74# D a_114_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VGND SCD a_1026_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_2568_508# a_547_301# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR a_2385_74# a_547_301# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 a_2274_392# a_1295_74# a_2385_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_27_74# D a_143_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_27_74# SCE a_669_111# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_27_74# a_639_85# a_669_111# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_669_111# a_1492_74# a_1688_97# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VGND a_159_404# a_505_111# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_554_463# a_547_301# a_27_74# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_143_74# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR SCD a_1053_455# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_1890_508# a_1910_71# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_2487_74# a_547_301# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_1688_97# a_1295_74# a_1890_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_505_111# a_547_301# a_27_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1026_125# SCE a_669_111# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_669_111# a_1295_74# a_1688_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_114_464# a_159_404# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 VPWR a_1688_97# a_1910_71# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X33 VPWR a_1910_71# a_2274_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X34 VPWR a_1295_74# a_1492_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X35 VGND CLK a_1295_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 VPWR DE a_554_463# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X37 a_1688_97# a_1492_74# a_1824_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 VGND a_1688_97# a_1910_71# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X39 VGND a_2385_74# a_547_301# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_1824_97# a_1910_71# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_2313_74# a_1492_74# a_2385_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.cdl b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.cdl
index 281b26c..2ec121b 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.cdl
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.cdl
@@ -16,88 +16,88 @@
 
 .SUBCKT sky130_fd_sc_ls__sedfxtp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI14 net146 M1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI14 net146 M1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB 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
-MI658 net135 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI637 clkpos clkneg VPB 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
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net118 q1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 deneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net98 sceneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI645 Q S0 VPB 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
-MI46 VPWR SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net95 D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net95 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net78 q1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 net135 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI641 net227 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB 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
-MI656 net211 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net95 sceneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB 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
-MI18 q1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI643 net118 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net107 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net98 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net95 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net95 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net78 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI635 clkneg CLK 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
+MI641 net227 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 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
-MI32 net95 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net211 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net95 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net187 M1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net95 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net187 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net179 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net179 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net167 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net158 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net167 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net158 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sedfxtp_2
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.netlist.tsv b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.netlist.tsv
index 03e44a3..690d329 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.netlist.tsv
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ls__sedfxtp_2	CLK:I D:I DE: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
-MI14	MOSFET	net146	M1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net146	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net135	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net118	q1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net118	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net135	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net107	deneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net98	sceneg	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net98	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net95	D	net107	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net95	SCE	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net78	q1	net95	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net78	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net227	q1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net227	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net211	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net211	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net95	sceneg	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net95	D	net167	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net187	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net187	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net179	q1	net95	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net179	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net167	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net158	SCE	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net158	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net146	M1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net146	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net135	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net118	q1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net118	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net135	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net107	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net98	sceneg	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net98	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net95	D	net107	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net95	SCE	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net78	q1	net95	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net78	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net227	q1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net227	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net211	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net211	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net95	sceneg	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net95	D	net167	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net187	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net187	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net179	q1	net95	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net179	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net167	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net158	SCE	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net158	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.spice b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.spice
index fb32d8b..2d846c9 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.spice
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_ls__sedfxtp_2 CLK D DE SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1736_97# a_1538_74# a_693_113# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=4.983e+11p ps=5.16e+06u
-M1001 VPWR a_1979_71# a_1936_508# VPB phighvt w=420000u l=150000u
-+  ad=3.08865e+12p pd=2.56e+07u as=1.68e+11p ps=1.64e+06u
-M1002 a_693_113# SCE a_40_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.808e+11p ps=3.75e+06u
-M1003 VPWR SCE a_663_87# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.856e+11p ps=1.86e+06u
-M1004 a_693_113# SCE a_1068_125# VNB nshort w=420000u l=150000u
-+  ad=3.885e+11p pd=4.37e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_138_74# D a_40_464# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.982e+11p ps=3.1e+06u
-M1006 a_2657_508# a_1538_74# a_2474_74# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=3.175e+11p ps=2.78e+06u
-M1007 a_1936_508# a_1340_74# a_1736_97# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Q a_2474_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=2.2744e+12p ps=1.998e+07u
-M1009 a_129_464# D a_40_464# VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1010 a_693_113# a_663_87# a_1079_455# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1011 a_1340_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1012 a_1736_97# a_1340_74# a_693_113# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=1.9e+06u as=0p ps=0u
-M1013 VGND DE a_180_290# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1014 a_575_463# DE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1015 a_500_113# a_180_290# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1016 a_1872_97# a_1538_74# a_1736_97# VNB nshort w=420000u l=150000u
-+  ad=2.247e+11p pd=1.91e+06u as=0p ps=0u
-M1017 a_1979_71# a_1736_97# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1018 a_1079_455# SCD VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_1979_71# a_1872_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_2569_74# a_1340_74# a_2474_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.915e+11p ps=1.93e+06u
-M1021 VGND a_548_87# a_2569_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_2474_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=2.87e+06u
-M1023 a_548_87# a_2474_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1024 a_1538_74# a_1340_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1025 a_40_464# a_548_87# a_500_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_693_113# a_663_87# a_40_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q a_2474_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_2357_392# a_1979_71# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=8.1e+11p pd=3.62e+06u as=0p ps=0u
-M1029 VGND DE a_138_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1979_71# a_1736_97# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1031 VGND SCE a_663_87# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1032 a_40_464# a_548_87# a_575_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1538_74# a_1340_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1034 VPWR a_180_290# a_129_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_548_87# a_2474_74# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.888e+11p pd=1.87e+06u as=0p ps=0u
-M1036 VGND a_2474_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_548_87# a_2657_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR DE a_180_290# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1039 a_2402_74# a_1979_71# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1040 a_2474_74# a_1538_74# a_2402_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1068_125# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1340_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1043 a_2474_74# a_1340_74# a_2357_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_693_113# a_1340_74# a_1736_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_500_113# a_548_87# a_40_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1068_125# SCE a_693_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_575_463# a_548_87# a_40_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_180_290# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1736_97# a_1538_74# a_1872_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_2402_74# a_1538_74# a_2474_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_693_113# a_1538_74# a_1736_97# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_40_464# D a_138_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_1340_74# a_1538_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_2569_74# a_548_87# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1872_97# a_1979_71# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_2474_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR a_1340_74# a_1538_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_138_74# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_1736_97# a_1979_71# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_40_464# D a_129_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_180_290# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 VGND a_180_290# a_500_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_129_464# a_180_290# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_1936_508# a_1979_71# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_2357_392# a_1340_74# a_2474_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 VGND a_1979_71# a_2402_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_2474_74# a_1340_74# a_2569_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR DE a_575_463# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 VPWR SCD a_1079_455# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 a_40_464# SCE a_693_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_1736_97# a_1340_74# a_1936_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_40_464# a_663_87# a_693_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_2474_74# a_1538_74# a_2657_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VGND a_2474_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X31 a_1079_455# a_663_87# a_693_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 VPWR a_1979_71# a_2357_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X33 VGND SCD a_1068_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_2657_508# a_548_87# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 VPWR a_2474_74# a_548_87# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X36 Q a_2474_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 VGND a_2474_74# a_548_87# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 Q a_2474_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X39 VPWR CLK a_1340_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X40 VPWR a_1736_97# a_1979_71# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X41 a_663_87# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X42 a_663_87# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 VGND CLK a_1340_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.cdl b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.cdl
index 7158066..3c04a29 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.cdl
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.cdl
@@ -16,88 +16,88 @@
 
 .SUBCKT sky130_fd_sc_ls__sedfxtp_4 CLK D DE SCD SCE VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I DE:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI14 net146 M1 VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI14 net146 M1 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 S0 clkneg VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 db clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 Q S0 VPB phighvt 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
-MI658 net114 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MI637 clkpos clkneg VPB 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
+MI13 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI643 net118 q1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 M1 M0 VPB 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
-MI644 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 M0 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 q1 S0 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net107 deneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI651 db clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 net98 sceneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI645 Q S0 VPB 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
-MI46 VPWR SCD VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net95 D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 net95 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net87 q1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 deneg DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 VPWR DE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 sceneg SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI634 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265
+MI658 net114 M1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkneg CLK VNB 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
-MI641 net222 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 S0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 db clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 Q S0 VNB 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
-MI656 net211 M1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI43 net95 sceneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI638 clkneg CLK VPB 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
-MI18 q1 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI643 net118 q1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI639 M1 M0 VPB 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
+MI644 S0 clkpos VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 q1 S0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net107 deneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 net98 sceneg VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 VPWR SCD VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net95 D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net95 SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net87 q1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI36 deneg DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 VPWR DE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 sceneg SCE VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 sceneg SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkpos clkneg 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
+MI635 clkneg CLK 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
+MI641 net222 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 S0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 db clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI646 Q S0 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
-MI32 net95 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net211 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net95 sceneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 q1 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 net187 M1 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 sceneg SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI32 net95 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net187 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net174 q1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 VGND deneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 deneg DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net174 q1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI39 VGND deneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI37 deneg DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 net167 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI49 net163 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 VGND SCD VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net167 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI49 net163 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI48 VGND SCD VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__sedfxtp_4
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.netlist.tsv b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.netlist.tsv
index feb6247..e996934 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.netlist.tsv
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_ls__sedfxtp_4	CLK:I D:I DE: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
-MI14	MOSFET	net146	M1	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net146	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S0	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net114	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net118	q1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net118	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net114	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	q1	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net107	deneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	net98	sceneg	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	VPWR	SCD	net98	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net95	D	net107	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net95	SCE	db	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net87	q1	net95	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	deneg	DE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	VPWR	DE	net87	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	sceneg	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net222	q1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net222	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	db	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	Q	S0	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net211	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net211	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net95	sceneg	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	q1	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	sceneg	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net95	D	net167	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net187	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net187	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net174	q1	net95	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	VGND	deneg	net174	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	deneg	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net167	DE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net163	SCE	db	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	VGND	SCD	net163	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net146	M1	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	S0	clkneg	net146	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S0	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net114	M1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net118	q1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net118	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net114	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	q1	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net107	deneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	net98	sceneg	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	VPWR	SCD	net98	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net95	D	net107	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net95	SCE	db	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net87	q1	net95	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	deneg	DE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	VPWR	DE	net87	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	sceneg	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net222	q1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net222	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	db	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	Q	S0	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net211	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net211	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net95	sceneg	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	q1	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	sceneg	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net95	D	net167	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net187	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net187	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net174	q1	net95	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	VGND	deneg	net174	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	deneg	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net167	DE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net163	SCE	db	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	VGND	SCD	net163	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.spice b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.spice
index 0be9685..2766303 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.spice
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_ls__sedfxtp_4 CLK D DE SCD SCE VGND VNB VPB VPWR Q
-M1000 a_135_74# D a_37_464# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1001 a_661_113# SCE a_1044_125# VNB nshort w=420000u l=150000u
-+  ad=5.502e+11p pd=5.14e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_1943_53# a_1756_97# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.31e+11p pd=2.23e+06u as=3.30785e+12p ps=2.82e+07u
-M1003 VPWR a_2403_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1004 VGND DE a_177_290# VNB nshort w=420000u l=150000u
-+  ad=2.3264e+12p pd=2.159e+07u as=1.197e+11p ps=1.41e+06u
-M1005 VPWR a_177_290# a_126_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1006 a_37_464# a_545_87# a_572_463# VPB phighvt w=640000u l=150000u
-+  ad=3.808e+11p pd=3.75e+06u as=1.536e+11p ps=1.76e+06u
-M1007 a_1044_125# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_2403_74# a_1313_74# a_2292_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3.049e+11p pd=2.72e+06u as=8.1e+11p ps=3.62e+06u
-M1009 VPWR a_1943_53# a_1899_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.386e+11p ps=1.5e+06u
-M1010 VPWR DE a_177_290# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1011 a_1510_74# a_1313_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1012 a_1071_455# SCD VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1013 a_2498_74# a_1313_74# a_2403_74# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.915e+11p ps=1.93e+06u
-M1014 VGND a_545_87# a_2498_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_661_113# SCE a_37_464# VPB phighvt w=640000u l=150000u
-+  ad=4.707e+11p pd=5.06e+06u as=0p ps=0u
-M1016 a_545_87# a_2403_74# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1017 a_1510_74# a_1313_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1018 a_1756_97# a_1510_74# a_661_113# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1019 Q a_2403_74# VGND VNB nshort w=740000u l=150000u
-+  ad=4.255e+11p pd=4.11e+06u as=0p ps=0u
-M1020 a_37_464# a_545_87# a_497_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1021 a_661_113# a_631_87# a_37_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1313_74# CLK VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=0p ps=0u
-M1023 a_126_464# D a_37_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_2403_74# Q VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1899_508# a_1313_74# a_1756_97# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_2403_74# a_1510_74# a_2331_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1027 VGND a_1943_53# a_1858_79# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.785e+11p ps=1.69e+06u
-M1028 a_572_463# DE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND DE a_135_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_545_87# a_2586_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1031 a_545_87# a_2403_74# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=0p ps=0u
-M1032 a_1858_79# a_1510_74# a_1756_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.6695e+11p ps=1.74e+06u
-M1033 Q a_2403_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_661_113# a_631_87# a_1071_455# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_497_113# a_177_290# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_2403_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1756_97# a_1313_74# a_661_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q a_2403_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Q a_2403_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_2403_74# Q VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1313_74# CLK VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.08e+11p pd=2.79e+06u as=0p ps=0u
-M1042 VGND SCE a_631_87# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1043 a_2292_392# a_1943_53# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR SCE a_631_87# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1045 a_2586_508# a_1510_74# a_2403_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1943_53# a_1756_97# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1047 a_2331_74# a_1943_53# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1756_97# a_1943_53# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 Q a_2403_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_37_464# D a_135_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_2292_392# a_1313_74# a_2403_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND a_1943_53# a_2331_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR SCD a_1071_455# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_135_74# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND CLK a_1313_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 Q a_2403_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_1756_97# a_1313_74# a_1899_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND SCD a_1044_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1899_508# a_1943_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_2331_74# a_1510_74# a_2403_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_1756_97# a_1510_74# a_1858_79# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_2498_74# a_545_87# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_37_464# D a_126_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 a_177_290# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_126_464# a_177_290# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_631_87# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_631_87# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_1943_53# a_2292_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X21 VGND a_1313_74# a_1510_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 VPWR DE a_572_463# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 VGND a_177_290# a_497_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_37_464# SCE a_661_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_1071_455# a_631_87# a_661_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VPWR a_1313_74# a_1510_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_1044_125# SCE a_661_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_2403_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_2403_74# a_1313_74# a_2498_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_497_113# a_545_87# a_37_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_2403_74# a_1510_74# a_2586_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 a_661_113# a_1313_74# a_1756_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_661_113# a_1510_74# a_1756_97# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 a_177_290# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VGND a_2403_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X36 VPWR a_2403_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X37 Q a_2403_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X38 a_2586_508# a_545_87# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 VPWR a_2403_74# a_545_87# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X40 VGND a_1756_97# a_1943_53# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X41 VPWR CLK a_1313_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X42 a_37_464# a_631_87# a_661_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 Q a_2403_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X44 a_572_463# a_545_87# a_37_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X45 VGND a_2403_74# Q VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X46 a_1858_79# a_1943_53# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X47 VGND a_2403_74# a_545_87# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.cdl b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.cdl
index b3bc8e3..07e3dca 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.cdl
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid 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
-MMNaoi11 nmid B 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
-MMNaoi20 Y inand 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
-MMPnand0 inand A VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB 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
-MMPaoi11 sndPA B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid 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
-MMPaoi20 Y inand VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B 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
+MMNaoi20 Y inand 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
+MMPnand0 inand A VPB 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
+MMPnand1 inand B VPB 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
+MMPaoi10 VPWR A VPB 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
+MMPaoi11 sndPA B VPB 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
+MMPaoi20 Y inand VPB 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
 .ENDS sky130_fd_sc_ls__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.netlist.tsv b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.netlist.tsv
index f605e71..ee6408c 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__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	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.spice b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.spice
index 7816408..b272613 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.spice
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__xnor2_1 A B VGND VNB VPB VPWR Y
-M1000 a_376_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.024e+11p pd=2.78e+06u as=1.19585e+12p ps=8.62e+06u
-M1001 VPWR B a_138_385# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.28e+06u
-M1002 a_138_385# B a_112_119# VNB nshort w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=1.344e+11p ps=1.7e+06u
-M1003 Y a_138_385# a_293_74# VNB nshort w=740000u l=150000u
-+  ad=2.294e+11p pd=2.1e+06u as=4.107e+11p ps=4.07e+06u
-M1004 a_138_385# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_138_385# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=3.08e+06u
-M1006 a_112_119# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.4e+11p ps=4.52e+06u
-M1007 Y B a_376_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_293_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_293_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_376_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y a_138_385# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X2 a_138_385# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 VPWR A a_138_385# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VGND B a_293_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_112_119# B a_138_385# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VGND A a_112_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_293_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_293_74# a_138_385# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VPWR A a_376_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.cdl b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.cdl
index 6282fd6..9d53a1f 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.cdl
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__xnor2_2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB 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
-MMNnand1 sndNA B 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
-MMNaoi10 nmid 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
-MMNaoi11 nmid B 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
-MMNaoi20 Y inand 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
-MMPnand0 inand A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB 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
-MMPaoi11 sndPA B VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND 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
-MMPaoi20 Y inand VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B 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
+MMNaoi10 nmid 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
+MMNaoi11 nmid B 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
+MMNaoi20 Y inand 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
+MMPnand0 inand A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR A VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 sndPA B VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=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
 .ENDS sky130_fd_sc_ls__xnor2_2
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.netlist.tsv b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.netlist.tsv
index 063a27e..db8ae5e 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__xnor2_2	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	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.spice b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.spice
index 6b8ed2c..ce46c3e 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.spice
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_ls__xnor2_2 A B VGND VNB VPB VPWR Y
-M1000 a_133_368# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.45e+11p pd=2.69e+06u as=2.25905e+12p ps=1.319e+07u
-M1001 Y a_133_368# a_340_107# VNB nshort w=740000u l=150000u
-+  ad=4.008e+11p pd=2.67e+06u as=8.30525e+11p ps=8.22e+06u
-M1002 Y B a_638_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=9.566e+11p ps=6.32e+06u
-M1003 VGND B a_340_107# VNB nshort w=740000u l=150000u
-+  ad=1.024e+12p pd=7.92e+06u as=0p ps=0u
-M1004 Y a_133_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_340_107# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_340_107# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B a_133_368# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_638_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_133_368# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_638_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_638_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_133_368# B a_151_74# VNB nshort w=740000u l=150000u
-+  ad=2.06875e+11p pd=2.05e+06u as=1.776e+11p ps=1.96e+06u
-M1013 a_151_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_340_107# a_133_368# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_340_107# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_133_368# a_340_107# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_340_107# a_133_368# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_340_107# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 Y a_133_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_151_74# B a_133_368# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR A a_133_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_133_368# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 Y B a_638_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 a_340_107# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 VGND A a_340_107# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 VPWR A a_638_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_638_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND B a_340_107# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR a_133_368# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 VGND A a_151_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 a_638_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.cdl b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.cdl
index abdd9c4..be069ba 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.cdl
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__xnor2_4 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMNnand0 VGND A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA B VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid A 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
-MMNaoi11 nmid B 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
-MMNaoi20 Y inand 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
-MMPnand0 inand A VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB phighvt m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B VNB nfet_01v8 m=2 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB phighvt 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
-MMPaoi11 sndPA B VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid A 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
-MMPaoi20 Y inand VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B 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
+MMNaoi20 Y inand 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
+MMPnand0 inand A VPB pfet_01v8_hvt m=2 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
+MMPnand1 inand B VPB pfet_01v8_hvt m=2 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
+MMPaoi10 VPWR A VPB 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
+MMPaoi11 sndPA B VPB 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
+MMPaoi20 Y inand VPB 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
 .ENDS sky130_fd_sc_ls__xnor2_4
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.netlist.tsv b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.netlist.tsv
index 474afb4..183834a 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__xnor2_4	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	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.spice b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.spice
index 12e3a2f..ef54fbe 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.spice
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ls__xnor2_4 A B VGND VNB VPB VPWR Y
-M1000 VPWR A a_950_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.77233e+12p pd=1.9e+07u as=1.6688e+12p ps=1.418e+07u
-M1001 Y B a_950_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.008e+12p pd=8.52e+06u as=0p ps=0u
-M1002 a_511_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=1.6317e+12p pd=1.477e+07u as=1.7674e+12p ps=1.293e+07u
-M1003 VPWR B a_116_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=5.04e+11p ps=4.56e+06u
-M1004 VPWR A a_950_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_511_74# a_116_368# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.22e+06u
-M1006 VGND A a_511_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_950_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_511_74# a_116_368# Y VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_511_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B a_511_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_116_368# a_511_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_74# A VGND VNB nshort w=640000u l=150000u
-+  ad=5.44e+11p pd=5.54e+06u as=0p ps=0u
-M1013 Y B a_950_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_116_368# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_116_368# A VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_116_368# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A a_511_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_74# B a_116_368# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.24e+11p ps=1.98e+06u
-M1019 a_511_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_511_74# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_950_368# B Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_116_368# B a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_950_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_116_368# Y VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_950_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_116_368# B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A a_27_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_116_368# a_511_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND B a_511_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_950_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 Y a_116_368# a_511_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 VPWR a_116_368# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_950_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 VGND A a_511_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 a_511_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 VPWR B a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X7 a_950_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A a_511_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_511_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_950_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 Y a_116_368# a_511_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_511_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR A a_116_368# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_950_368# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 Y a_116_368# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_116_368# B a_27_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VPWR A a_950_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X18 VGND B a_511_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_511_74# a_116_368# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 a_511_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_116_368# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 VGND B a_511_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X23 a_116_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 a_27_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 VGND A a_27_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 Y B a_950_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X27 a_27_74# B a_116_368# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 Y B a_950_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X29 a_511_74# a_116_368# Y VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.cdl b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.cdl
index 2ea725d..f29c989 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.cdl
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__xnor3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net57 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
-MI29 Ab Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI649 mid1 Cb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net57 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net57 VPB 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
+MI650 mid1 C VPB 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
+MI27 mid2 B VPB 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
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB 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
-MI47 Abb Ab VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB 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
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB 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
-MI19 mid1 Bb VPB 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
+MI19 mid1 Bb VPB 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
 .ENDS sky130_fd_sc_ls__xnor3_1
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.netlist.tsv b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.netlist.tsv
index 5e812a1..dbff2cd 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__xnor3_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
-MMIN3	MOSFET	X	net57	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net57	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net57	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net57	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net57	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net57	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	C	net57	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	mid2	Cb	net57	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.spice b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.spice
index 789378b..6ef9eff 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.spice
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__xnor3_1 A B C VGND VNB VPB VPWR X
-M1000 VGND a_81_268# X VNB nshort w=740000u l=150000u
-+  ad=1.0267e+12p pd=7.95e+06u as=2.109e+11p ps=2.05e+06u
-M1001 a_1113_383# B a_371_74# VNB nshort w=640000u l=150000u
-+  ad=4.096e+11p pd=3.95e+06u as=4.48e+11p ps=3.96e+06u
-M1002 a_363_394# a_786_100# a_897_54# VPB phighvt w=840000u l=150000u
-+  ad=5.532e+11p pd=4.72e+06u as=7.3745e+11p ps=5.65e+06u
-M1003 a_1113_383# B a_363_394# VPB phighvt w=640000u l=150000u
-+  ad=4.92e+11p pd=4.48e+06u as=0p ps=0u
-M1004 a_1113_383# a_897_54# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=1.2852e+12p ps=9.15e+06u
-M1005 a_897_54# B a_371_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=6.14e+11p ps=4.91e+06u
-M1006 a_1113_383# a_897_54# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_81_268# C a_363_394# VPB phighvt w=840000u l=150000u
-+  ad=4.1795e+11p pd=2.85e+06u as=0p ps=0u
-M1008 a_363_394# a_232_162# a_81_268# VNB nshort w=640000u l=150000u
-+  ad=4.271e+11p pd=3.96e+06u as=2.24e+11p ps=1.98e+06u
-M1009 a_371_74# a_232_162# a_81_268# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_371_74# a_786_100# a_897_54# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.95425e+11p ps=4.74e+06u
-M1011 a_81_268# C a_371_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_371_74# a_786_100# a_1113_383# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_232_162# C VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.888e+11p pd=1.87e+06u as=0p ps=0u
-M1014 a_232_162# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.575e+11p pd=1.59e+06u as=0p ps=0u
-M1015 a_897_54# B a_363_394# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A a_897_54# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A a_897_54# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_81_268# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.192e+11p ps=2.81e+06u
-M1019 a_786_100# B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.192e+11p pd=2.81e+06u as=0p ps=0u
-M1020 a_363_394# a_786_100# a_1113_383# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_786_100# B VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
+X0 a_81_268# a_232_162# a_371_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VGND C a_232_162# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_363_394# C a_81_268# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_897_54# a_786_100# a_363_394# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 X a_81_268# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR a_897_54# a_1113_383# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_363_394# B a_897_54# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 VGND B a_786_100# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 X a_81_268# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_897_54# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_81_268# a_232_162# a_363_394# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_363_394# B a_1113_383# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VGND a_897_54# a_1113_383# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_897_54# a_786_100# a_371_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 VPWR B a_786_100# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_897_54# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_371_74# C a_81_268# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_371_74# B a_897_54# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_1113_383# a_786_100# a_363_394# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR C a_232_162# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_1113_383# a_786_100# a_371_74# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_371_74# B a_1113_383# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.cdl b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.cdl
index a81a414..f59301b 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.cdl
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__xnor3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net57 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
-MI29 Ab Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI649 mid1 Cb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net57 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net57 VPB 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
+MI650 mid1 C VPB 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
+MI27 mid2 B VPB 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
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB 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
-MI47 Abb Ab VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB 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
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB 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
-MI19 mid1 Bb VPB 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
+MI19 mid1 Bb VPB 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
 .ENDS sky130_fd_sc_ls__xnor3_2
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.netlist.tsv b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.netlist.tsv
index 69182aa..1218bd6 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__xnor3_2	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
-MMIN3	MOSFET	X	net57	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net57	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net57	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net57	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net57	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net57	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	C	net57	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	mid2	Cb	net57	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.spice b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.spice
index cf4e853..a2516b4 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.spice
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__xnor3_2 A B C VGND VNB VPB VPWR X
-M1000 a_83_247# a_397_21# a_332_373# VNB nshort w=640000u l=150000u
-+  ad=5.925e+11p pd=4.86e+06u as=4.512e+11p ps=3.97e+06u
-M1001 a_332_373# B a_27_373# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.886e+11p ps=3.85e+06u
-M1002 a_27_373# a_397_21# a_329_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.22e+11p ps=4.25e+06u
-M1003 a_329_81# B a_27_373# VPB phighvt w=640000u l=150000u
-+  ad=5.522e+11p pd=4.72e+06u as=4.998e+11p ps=4.51e+06u
-M1004 a_27_373# a_397_21# a_332_373# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.92e+11p ps=4.86e+06u
-M1005 a_332_373# B a_83_247# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=7.498e+11p ps=5.67e+06u
-M1006 X a_1057_74# VGND VNB nshort w=740000u l=150000u
-+  ad=2.072e+11p pd=2.04e+06u as=1.54235e+12p ps=1.041e+07u
-M1007 a_83_247# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_83_247# a_27_373# VPB phighvt w=1e+06u l=150000u
-+  ad=1.6338e+12p pd=1.205e+07u as=0p ps=0u
-M1009 VGND a_83_247# a_27_373# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C a_1027_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1011 a_83_247# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_83_247# a_397_21# a_329_81# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_1057_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1014 VGND B a_397_21# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1015 VGND a_1057_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_329_81# C a_1057_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.2765e+11p ps=2.87e+06u
-M1017 VPWR C a_1027_48# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.856e+11p ps=1.86e+06u
-M1018 a_329_81# B a_83_247# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_332_373# C a_1057_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.24e+11p ps=1.98e+06u
-M1020 VPWR B a_397_21# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.248e+11p ps=2.82e+06u
-M1021 a_1057_74# a_1027_48# a_332_373# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_1057_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1057_74# a_1027_48# a_329_81# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1027_48# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_27_373# a_83_247# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 X a_1057_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 a_83_247# B a_329_81# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_332_373# a_397_21# a_27_373# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND a_1057_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X6 a_397_21# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 X a_1057_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_83_247# B a_332_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_397_21# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X10 a_1057_74# C a_332_373# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_1057_74# C a_329_81# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_332_373# a_1027_48# a_1057_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_27_373# a_83_247# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_1027_48# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_329_81# a_397_21# a_83_247# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VPWR a_1057_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_329_81# a_1027_48# a_1057_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_27_373# B a_332_373# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_27_373# B a_329_81# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_329_81# a_397_21# a_27_373# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR A a_83_247# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 VGND A a_83_247# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_332_373# a_397_21# a_83_247# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.cdl b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.cdl
index 43999d2..09c4e5e 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.cdl
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__xnor3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN3 X net57 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net57 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
-MI29 Ab Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI649 mid1 Cb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X net57 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net57 VPB 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
+MI650 mid1 C VPB 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
+MI27 mid2 B VPB 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
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 mid2 Cb VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 Bb B VPB 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
-MI47 Abb Ab VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 mid2 Cb VPB 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
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB 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
-MI19 mid1 Bb VPB 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
+MI19 mid1 Bb VPB 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
 .ENDS sky130_fd_sc_ls__xnor3_4
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.netlist.tsv b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.netlist.tsv
index aef790e..b0e5f0e 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__xnor3_4	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
-MMIN3	MOSFET	X	net57	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net57	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net57	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net57	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net57	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net57	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net57	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net57	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	C	net57	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	mid2	Cb	net57	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.spice b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.spice
index 0769afc..0da2aa7 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.spice
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__xnor3_4 A B C VGND VNB VPB VPWR X
-M1000 a_75_227# A VGND VNB nshort w=640000u l=150000u
-+  ad=5.611e+11p pd=4.74e+06u as=2.35215e+12p ps=1.359e+07u
-M1001 X a_1057_74# VGND VNB nshort w=740000u l=150000u
-+  ad=4.144e+11p pd=4.08e+06u as=0p ps=0u
-M1002 a_324_373# B a_27_373# VNB nshort w=640000u l=150000u
-+  ad=3.84e+11p pd=3.76e+06u as=4.635e+11p ps=4.06e+06u
-M1003 a_27_373# a_386_23# a_321_77# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.739e+11p ps=3.78e+06u
-M1004 a_75_227# a_386_23# a_324_373# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_324_373# C a_1057_74# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.592e+11p ps=2.09e+06u
-M1006 VGND a_1057_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_373# a_386_23# a_324_373# VPB phighvt w=640000u l=150000u
-+  ad=4.87e+11p pd=4.47e+06u as=6.528e+11p ps=5.05e+06u
-M1008 X a_1057_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=6.72e+11p pd=5.68e+06u as=2.41e+12p ps=1.554e+07u
-M1009 VGND a_1057_74# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_75_227# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=7.6215e+11p pd=5.69e+06u as=0p ps=0u
-M1011 VPWR a_75_227# a_27_373# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_75_227# a_27_373# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND C a_1024_300# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1014 VPWR B a_386_23# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1015 a_321_77# B a_27_373# VPB phighvt w=640000u l=150000u
-+  ad=5.312e+11p pd=4.67e+06u as=0p ps=0u
-M1016 VPWR a_1057_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_75_227# a_386_23# a_321_77# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR C a_1024_300# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1019 VPWR a_1057_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_321_77# C a_1057_74# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.557e+11p ps=3.04e+06u
-M1021 VGND B a_386_23# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.109e+11p ps=2.05e+06u
-M1022 a_324_373# B a_75_227# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_1057_74# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_321_77# B a_75_227# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1057_74# a_1024_300# a_324_373# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1057_74# a_1024_300# a_321_77# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_1057_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_1057_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 a_324_373# a_386_23# a_75_227# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 X a_1057_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X3 VGND A a_75_227# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_27_373# a_75_227# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_75_227# B a_324_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 VPWR a_1057_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X7 a_27_373# a_75_227# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_1024_300# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 VPWR A a_75_227# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 VPWR a_1057_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_386_23# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_27_373# B a_321_77# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_321_77# a_386_23# a_27_373# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_386_23# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X15 a_75_227# B a_321_77# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 X a_1057_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X17 a_1024_300# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VGND a_1057_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_321_77# a_386_23# a_75_227# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_321_77# a_1024_300# a_1057_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 X a_1057_74# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 a_1057_74# C a_321_77# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 a_324_373# a_1024_300# a_1057_74# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 a_1057_74# C a_324_373# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_324_373# a_386_23# a_27_373# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 a_27_373# B a_324_373# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VGND a_1057_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_1.cdl b/cells/xor2/sky130_fd_sc_ls__xor2_1.cdl
index 6ab82ef..110f6cd 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_1.cdl
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__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 nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND 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
-MMNaoi11 sndNA B 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
-MMNaoi20 X inor 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
-MMPnor0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB 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
-MMPaoi11 pmid B VPB 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
-MMPaoi20 X inor VPB 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
+MMNnor0 inor A VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8 m=1 w=0.55 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND 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
+MMNaoi11 sndNA B 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
+MMNaoi20 X inor 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
+MMPnor0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8_hvt m=1 w=1.12 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_ls__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_1.netlist.tsv b/cells/xor2/sky130_fd_sc_ls__xor2_1.netlist.tsv
index b7f46e9..c804378 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_1.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__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	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_1.spice b/cells/xor2/sky130_fd_sc_ls__xor2_1.spice
index a7dd080..4a388c5 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_1.spice
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_ls__xor2_1 A B VGND VNB VPB VPWR X
-M1000 VGND B a_194_125# VNB nshort w=550000u l=150000u
-+  ad=8.846e+11p pd=6.8e+06u as=3.5475e+11p ps=2.39e+06u
-M1001 a_455_87# A VGND VNB nshort w=740000u l=150000u
-+  ad=1.776e+11p pd=1.96e+06u as=0p ps=0u
-M1002 X B a_455_87# VNB nshort w=740000u l=150000u
-+  ad=3.108e+11p pd=2.32e+06u as=0p ps=0u
-M1003 a_194_125# B a_158_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=2.7e+11p ps=2.54e+06u
-M1004 a_355_368# B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=7.672e+11p pd=5.85e+06u as=7.654e+11p ps=5.67e+06u
-M1005 a_194_125# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_158_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_355_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_194_125# a_355_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.864e+11p pd=2.93e+06u as=0p ps=0u
-M1009 VGND a_194_125# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_194_125# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 VPWR A a_158_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_158_392# B a_194_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_355_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_455_87# B X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X5 VPWR B a_355_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 X a_194_125# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_355_368# a_194_125# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X8 VGND A a_455_87# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X9 a_194_125# B VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_2.cdl b/cells/xor2/sky130_fd_sc_ls__xor2_2.cdl
index 0631a2f..36f6716 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_2.cdl
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__xor2_2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND 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
-MMNaoi11 sndNA B 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
-MMNaoi20 X inor 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
-MMPnor0 VPWR A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB 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
-MMPaoi11 pmid B VPB 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
-MMPaoi20 X inor VPB 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
+MMNnor0 inor A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND 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
+MMNaoi11 sndNA B 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
+MMNaoi20 X inor 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
+MMPnor0 VPWR A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8_hvt m=2 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8_hvt m=2 w=1.12 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_ls__xor2_2
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_2.netlist.tsv b/cells/xor2/sky130_fd_sc_ls__xor2_2.netlist.tsv
index ed3c70a..c7f6d65 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_2.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__xor2_2	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	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_2.spice b/cells/xor2/sky130_fd_sc_ls__xor2_2.spice
index fb894d2..58044de 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_2.spice
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_2.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_ls__xor2_2 A B VGND VNB VPB VPWR X
-M1000 VGND B a_183_74# VNB nshort w=640000u l=150000u
-+  ad=1.4793e+12p pd=8.78e+06u as=1.792e+11p ps=1.84e+06u
-M1001 a_313_368# a_183_74# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.344e+12p pd=1.136e+07u as=3.36e+11p ps=2.84e+06u
-M1002 X B a_399_74# VNB nshort w=740000u l=150000u
-+  ad=4.181e+11p pd=4.09e+06u as=5.66e+11p ps=4.61e+06u
-M1003 a_399_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B a_313_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.079e+12p pd=8.47e+06u as=0p ps=0u
-M1005 a_183_74# B a_116_392# VPB phighvt w=1e+06u l=150000u
-+  ad=2.95e+11p pd=2.59e+06u as=2.7e+11p ps=2.54e+06u
-M1006 VPWR A a_313_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_183_74# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_399_74# B X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_313_368# B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_399_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_313_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_116_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_183_74# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_183_74# a_313_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_313_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X1 VGND A a_399_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_399_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 X B a_399_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X4 X a_183_74# a_313_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR A a_313_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A a_116_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_116_392# B a_183_74# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_313_368# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VGND A a_183_74# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_399_74# B X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 a_313_368# a_183_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 VGND a_183_74# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X13 VPWR B a_313_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_183_74# B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_4.cdl b/cells/xor2/sky130_fd_sc_ls__xor2_4.cdl
index bd1469e..874bc23 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_4.cdl
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_ls__xor2_4 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 inor A VNB 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
-MMNnor1 inor B 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
-MMNaoi10 VGND A 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
-MMNaoi11 sndNA B 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
-MMNaoi20 X inor 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
-MMPnor0 VPWR A VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA B VPB phighvt m=2 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid A VPB phighvt 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
-MMPaoi11 pmid B VPB phighvt 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
-MMPaoi20 X inor VPB phighvt 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
+MMNnor0 inor 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
+MMNnor1 inor B 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
+MMNaoi10 VGND A 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
+MMNaoi11 sndNA B 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
+MMNaoi20 X inor 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
+MMPnor0 VPWR A VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor1 sndPA B VPB pfet_01v8_hvt m=2 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid A VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B VPB pfet_01v8_hvt m=4 w=1.12 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 X inor VPB pfet_01v8_hvt m=4 w=1.12 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_ls__xor2_4
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_4.netlist.tsv b/cells/xor2/sky130_fd_sc_ls__xor2_4.netlist.tsv
index 1cb8efe..d53c85c 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_4.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_ls__xor2_4	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	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	2	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_4.spice b/cells/xor2/sky130_fd_sc_ls__xor2_4.spice
index f7fd3f8..5747366 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_4.spice
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_ls__xor2_4 A B VGND VNB VPB VPWR X
-M1000 a_160_98# A VGND VNB nshort w=740000u l=150000u
-+  ad=4.958e+11p pd=4.3e+06u as=2.40945e+12p ps=1.687e+07u
-M1001 a_160_98# B a_36_392# VPB phighvt w=1e+06u l=150000u
-+  ad=3e+11p pd=2.6e+06u as=8.7e+11p ps=7.74e+06u
-M1002 VPWR B a_514_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.11625e+12p pd=1.554e+07u as=2.3128e+12p ps=1.981e+07u
-M1003 X B a_877_74# VNB nshort w=740000u l=150000u
-+  ad=8.325e+11p pd=6.69e+06u as=1.0952e+12p ps=1.036e+07u
-M1004 a_514_368# a_160_98# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=6.72e+11p ps=5.68e+06u
-M1005 a_514_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_36_392# B a_160_98# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_877_74# B X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_160_98# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_877_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_877_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_514_368# B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_160_98# a_514_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_514_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_877_74# B X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B a_514_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A a_160_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_160_98# B VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_514_368# a_160_98# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X B a_877_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_877_74# A VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_36_392# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_514_368# B VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A a_36_392# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A a_877_74# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A a_514_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND B a_160_98# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_160_98# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_514_368# A VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 X a_160_98# a_514_368# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_160_98# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X1 X B a_877_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X2 a_877_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 VPWR B a_514_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X4 a_514_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 VPWR B a_514_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 a_36_392# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_160_98# B a_36_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 a_514_368# a_160_98# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 VPWR A a_514_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X10 VGND A a_160_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X11 VPWR A a_514_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X12 a_514_368# a_160_98# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X13 VPWR A a_36_392# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 VGND a_160_98# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X15 VGND B a_160_98# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X16 a_160_98# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X17 VGND A a_877_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X18 a_160_98# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 a_514_368# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X20 VGND A a_877_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X21 a_877_74# B X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X22 X a_160_98# a_514_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X23 a_514_368# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X24 X B a_877_74# VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X25 a_514_368# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X26 a_877_74# B X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X27 X a_160_98# a_514_368# VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X28 a_877_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X29 a_36_392# B a_160_98# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_1.cdl b/cells/xor3/sky130_fd_sc_ls__xor3_1.cdl
index e2aeefb..328c182 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_1.cdl
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__xor3_1 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net117 VPB 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
+MI650 mid1 Cb VPB 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
+MI1 mid2 C VPB 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
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VNB nfet_01v8 m=1 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net117 VNB nshort m=1 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB 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
-MI24 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__xor3_1
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_1.netlist.tsv b/cells/xor3/sky130_fd_sc_ls__xor3_1.netlist.tsv
index 2105f5b..eab486f 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_1.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__xor3_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
-MMIP3	MOSFET	X	net117	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net117	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net117	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net117	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	C	net117	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	Cb	net117	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net117	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	Cb	net117	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	mid2	C	net117	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net117	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	C	net117	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	Cb	net117	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_1.spice b/cells/xor3/sky130_fd_sc_ls__xor3_1.spice
index 7d87213..24fcc64 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_1.spice
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_ls__xor3_1 A B C VGND VNB VPB VPWR X
-M1000 a_27_134# a_452_288# a_416_86# VNB nshort w=420000u l=150000u
-+  ad=4.987e+11p pd=4.17e+06u as=4.475e+11p ps=4.01e+06u
-M1001 a_416_86# C a_1215_396# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.392e+11p ps=2.34e+06u
-M1002 a_416_86# B a_27_134# VPB phighvt w=640000u l=150000u
-+  ad=6.2055e+11p pd=4.89e+06u as=4.998e+11p ps=4.51e+06u
-M1003 a_384_392# B a_84_108# VPB phighvt w=840000u l=150000u
-+  ad=5.784e+11p pd=4.78e+06u as=8.756e+11p ps=5.66e+06u
-M1004 a_1215_396# a_1157_298# a_416_86# VPB phighvt w=840000u l=150000u
-+  ad=5.082e+11p pd=2.89e+06u as=0p ps=0u
-M1005 VGND B a_452_288# VNB nshort w=740000u l=150000u
-+  ad=1.3258e+12p pd=8.35e+06u as=2.035e+11p ps=2.03e+06u
-M1006 a_27_134# a_452_288# a_384_392# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B a_452_288# VPB phighvt w=1.12e+06u l=150000u
-+  ad=1.3176e+12p pd=9.15e+06u as=3.304e+11p ps=2.83e+06u
-M1008 a_84_108# a_452_288# a_416_86# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_384_392# B a_27_134# VNB nshort w=640000u l=150000u
-+  ad=5.1415e+11p pd=4.38e+06u as=0p ps=0u
-M1010 X a_1215_396# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.304e+11p pd=2.83e+06u as=0p ps=0u
-M1011 a_416_86# B a_84_108# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=6.252e+11p ps=4.99e+06u
-M1012 VPWR C a_1157_298# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.528e+11p ps=2.07e+06u
-M1013 a_1215_396# a_1157_298# a_384_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND C a_1157_298# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1015 X a_1215_396# VGND VNB nshort w=740000u l=150000u
-+  ad=2.109e+11p pd=2.05e+06u as=0p ps=0u
-M1016 VPWR a_84_108# a_27_134# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_84_108# a_27_134# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_84_108# a_452_288# a_384_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_384_392# C a_1215_396# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_84_108# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_84_108# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1157_298# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_384_392# a_452_288# a_27_134# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_27_134# B a_384_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_384_392# a_1157_298# a_1215_396# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_84_108# B a_416_86# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_27_134# a_84_108# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_27_134# a_84_108# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VGND a_1215_396# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X8 a_1215_396# C a_384_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_384_392# a_452_288# a_84_108# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_1157_298# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND A a_84_108# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_27_134# B a_416_86# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_452_288# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_84_108# B a_384_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 VPWR a_1215_396# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X16 a_416_86# a_452_288# a_84_108# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_1215_396# C a_416_86# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 VPWR A a_84_108# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_416_86# a_1157_298# a_1215_396# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_416_86# a_452_288# a_27_134# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_452_288# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_2.cdl b/cells/xor3/sky130_fd_sc_ls__xor3_2.cdl
index 0c09371..00860aa 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_2.cdl
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__xor3_2 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB phighvt m=2 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net117 VPB 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
+MI650 mid1 Cb VPB 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
+MI1 mid2 C VPB 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
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VNB nfet_01v8 m=2 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net117 VNB nshort m=2 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB 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
-MI24 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__xor3_2
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_2.netlist.tsv b/cells/xor3/sky130_fd_sc_ls__xor3_2.netlist.tsv
index 2c76910..2334d75 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_2.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__xor3_2	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
-MMIP3	MOSFET	X	net117	VPWR	VPB	phighvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net117	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net117	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net117	VGND	VNB	nshort	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	C	net117	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	Cb	net117	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net117	VPWR	VPB	pfet_01v8_hvt	2	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	Cb	net117	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	mid2	C	net117	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net117	VGND	VNB	nfet_01v8	2	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	C	net117	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	Cb	net117	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_2.spice b/cells/xor3/sky130_fd_sc_ls__xor3_2.spice
index 460eaae..5b8acce 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_2.spice
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_ls__xor3_2 A B C VGND VNB VPB VPWR X
-M1000 VPWR a_83_289# a_27_134# VPB phighvt w=1e+06u l=150000u
-+  ad=1.897e+12p pd=1.228e+07u as=4.87e+11p ps=4.47e+06u
-M1001 X a_1195_424# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=3.36e+11p pd=2.84e+06u as=0p ps=0u
-M1002 VGND a_1195_424# X VNB nshort w=740000u l=150000u
-+  ad=1.66725e+12p pd=1.089e+07u as=2.072e+11p ps=2.04e+06u
-M1003 a_83_289# a_440_315# a_416_113# VPB phighvt w=840000u l=150000u
-+  ad=9.25e+11p pd=5.77e+06u as=5.532e+11p ps=4.72e+06u
-M1004 a_1195_424# a_1162_379# a_372_419# VNB nshort w=640000u l=150000u
-+  ad=3.3955e+11p pd=2.48e+06u as=4.75e+11p ps=4.11e+06u
-M1005 VPWR a_1195_424# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_83_289# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_416_113# C a_1195_424# VNB nshort w=640000u l=150000u
-+  ad=4.219e+11p pd=3.93e+06u as=0p ps=0u
-M1008 a_27_134# a_440_315# a_416_113# VNB nshort w=420000u l=150000u
-+  ad=4.987e+11p pd=4.17e+06u as=0p ps=0u
-M1009 VGND B a_440_315# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.035e+11p ps=2.03e+06u
-M1010 VPWR C a_1162_379# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.03e+06u
-M1011 VPWR B a_440_315# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1012 a_372_419# B a_83_289# VPB phighvt w=840000u l=150000u
-+  ad=5.28e+11p pd=4.66e+06u as=0p ps=0u
-M1013 a_1195_424# a_1162_379# a_416_113# VPB phighvt w=840000u l=150000u
-+  ad=5.124e+11p pd=2.9e+06u as=0p ps=0u
-M1014 X a_1195_424# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_134# a_440_315# a_372_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_372_419# B a_27_134# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_83_289# a_27_134# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND C a_1162_379# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 a_416_113# B a_83_289# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=6.24525e+11p ps=4.72e+06u
-M1020 a_83_289# a_440_315# a_372_419# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_416_113# B a_27_134# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_83_289# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_372_419# C a_1195_424# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1162_379# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_134# B a_416_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_416_113# a_1162_379# a_1195_424# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_27_134# a_83_289# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_83_289# B a_372_419# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 VPWR a_1195_424# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X6 VPWR A a_83_289# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_27_134# B a_372_419# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_372_419# a_440_315# a_83_289# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VGND A a_83_289# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_1162_379# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_372_419# a_1162_379# a_1195_424# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_372_419# a_440_315# a_27_134# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_440_315# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X14 a_27_134# a_83_289# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 a_83_289# B a_416_113# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_416_113# a_440_315# a_83_289# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_416_113# a_440_315# a_27_134# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VGND a_1195_424# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X19 X a_1195_424# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X20 X a_1195_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 a_1195_424# C a_416_113# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_1195_424# C a_372_419# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 a_440_315# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_4.cdl b/cells/xor3/sky130_fd_sc_ls__xor3_4.cdl
index b4beb83..b64c128 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_4.cdl
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_ls__xor3_4 A B C VGND VNB VPB VPWR X
 *.PININFO A:I B:I C:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP3 X net117 VPB phighvt m=4 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net117 VPB 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
+MI650 mid1 Cb VPB 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
+MI1 mid2 C VPB 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
+MI33 Cb C VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 mid1 Cb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 Ab A VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 mid2 C VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 Abb Ab VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 mid1 Bb VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI16 Bb B VPB pfet_01v8_hvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 Cb C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 mid2 Bb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 mid2 B VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X net117 VNB nfet_01v8 m=4 w=0.74 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 Cb C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 C VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI47 Abb Ab VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 Cb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 mid1 Bb VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 Ab A VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI16 Bb B VPB phighvt m=1 w=1.12 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 Abb Ab VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 mid1 B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B 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
-MI26 mid2 Bb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 mid2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X net117 VNB nshort m=4 w=0.74 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb B VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 mid1 C VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 mid2 Cb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 Ab A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 Abb Ab VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 Bb B VNB 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
-MI24 Ab B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 Abb Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 Abb B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 Ab Bb VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_ls__xor3_4
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_4.netlist.tsv b/cells/xor3/sky130_fd_sc_ls__xor3_4.netlist.tsv
index daa8cad..4582f85 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_4.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_ls__xor3_4	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
-MMIP3	MOSFET	X	net117	VPWR	VPB	phighvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net117	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net117	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net117	VGND	VNB	nshort	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	C	net117	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	Cb	net117	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	VGND	VNB	nshort	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	Abb	Bb	mid1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	Abb	B	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net117	VPWR	VPB	pfet_01v8_hvt	4	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	Cb	net117	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	mid2	C	net117	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1.12	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net117	VGND	VNB	nfet_01v8	4	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	C	net117	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	Cb	net117	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	VGND	VNB	nfet_01v8	1	0.74	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	Abb	Bb	mid1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	Abb	B	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_4.spice b/cells/xor3/sky130_fd_sc_ls__xor3_4.spice
index e3387d4..9291d16 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_4.spice
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_ls__xor3_4 A B C VGND VNB VPB VPWR X
-M1000 a_27_118# a_397_320# a_323_392# VPB phighvt w=640000u l=150000u
-+  ad=5.9475e+11p pd=5.02e+06u as=5.532e+11p ps=4.72e+06u
-M1001 VPWR a_1218_388# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=2.2388e+12p pd=1.511e+07u as=6.72e+11p ps=5.68e+06u
-M1002 a_323_392# B a_74_294# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=9.166e+11p ps=5.75e+06u
-M1003 VGND a_1218_388# X VNB nshort w=740000u l=150000u
-+  ad=1.6131e+12p pd=1.223e+07u as=4.144e+11p ps=4.08e+06u
-M1004 a_416_118# B a_27_118# VPB phighvt w=640000u l=150000u
-+  ad=6.8745e+11p pd=5.04e+06u as=0p ps=0u
-M1005 X a_1218_388# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_74_294# a_27_118# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.264e+11p ps=4.03e+06u
-M1007 a_323_392# B a_27_118# VNB nshort w=640000u l=150000u
-+  ad=4.6775e+11p pd=4.06e+06u as=0p ps=0u
-M1008 X a_1218_388# VPWR VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B a_397_320# VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=3.304e+11p ps=2.83e+06u
-M1010 a_1218_388# a_1155_284# a_323_392# VNB nshort w=640000u l=150000u
-+  ad=3.392e+11p pd=2.34e+06u as=0p ps=0u
-M1011 X a_1218_388# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_1218_388# VGND VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_1218_388# X VPB phighvt w=1.12e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_74_294# a_397_320# a_416_118# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_323_392# C a_1218_388# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.452e+11p ps=2.74e+06u
-M1016 VPWR C a_1155_284# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.888e+11p ps=1.87e+06u
-M1017 a_416_118# B a_74_294# VNB nshort w=640000u l=150000u
-+  ad=3.899e+11p pd=3.83e+06u as=7.264e+11p ps=4.83e+06u
-M1018 a_416_118# C a_1218_388# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_74_294# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_118# a_397_320# a_416_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_74_294# a_27_118# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1218_388# a_1155_284# a_416_118# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_1218_388# X VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_74_294# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B a_397_320# VNB nshort w=740000u l=150000u
-+  ad=0p pd=0u as=2.072e+11p ps=2.04e+06u
-M1026 a_74_294# a_397_320# a_323_392# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND C a_1155_284# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
+X0 a_416_118# a_1155_284# a_1218_388# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_27_118# B a_416_118# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 X a_1218_388# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X3 a_323_392# a_1155_284# a_1218_388# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 X a_1218_388# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X5 a_74_294# B a_416_118# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VGND a_1218_388# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X7 a_416_118# a_397_320# a_27_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_1218_388# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X9 a_1218_388# C a_416_118# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VPWR a_1218_388# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X11 a_397_320# B VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X12 a_1155_284# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_1155_284# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_27_118# B a_323_392# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_74_294# B a_323_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_416_118# a_397_320# a_74_294# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_323_392# a_397_320# a_74_294# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_27_118# a_74_294# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_1218_388# C a_323_392# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 X a_1218_388# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
+X21 VPWR A a_74_294# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 a_27_118# a_74_294# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 VGND a_1218_388# X VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X24 VGND A a_74_294# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 X a_1218_388# VGND VNB sky130_fd_pr__nfet_01v8 w=740000u l=150000u
+X26 a_323_392# a_397_320# a_27_118# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_397_320# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.12e+06u l=150000u
 .ends